You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by oh...@apache.org on 2018/07/23 12:05:07 UTC

[23/34] incubator-omid-site git commit: [wagon-git] commit to branch asf-site 7/23/18 3:04 PM

http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html b/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html
index 161b1ad..08b76e3 100644
--- a/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html
+++ b/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html
@@ -136,354 +136,384 @@
 <a class="jxr_linenumber" name="126" href="#126">126</a>         Mockito.reset(mockWriter);
 <a class="jxr_linenumber" name="127" href="#127">127</a>     }
 <a class="jxr_linenumber" name="128" href="#128">128</a> 
-<a class="jxr_linenumber" name="129" href="#129">129</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="130" href="#130">130</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfEmptyBatchPersistEvent() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="129" href="#129">129</a>     @Test(timeOut = 1_000)
+<a class="jxr_linenumber" name="130" href="#130">130</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPersistentProcessorHandlerIdsAreCreatedConsecutive() <strong class="jxr_keyword">throws</strong> Exception {
 <a class="jxr_linenumber" name="131" href="#131">131</a> 
-<a class="jxr_linenumber" name="132" href="#132">132</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="133" href="#133">133</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="134" href="#134">134</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="135" href="#135">135</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="136" href="#136">136</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="137" href="#137">137</a> 
-<a class="jxr_linenumber" name="138" href="#138">138</a>         verify(persistenceHandler, times(1)).flush(eq(0));
-<a class="jxr_linenumber" name="139" href="#139">139</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="140" href="#140">140</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="141" href="#141">141</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="142" href="#142">142</a>         assertTrue(batch.isEmpty());
-<a class="jxr_linenumber" name="143" href="#143">143</a> 
-<a class="jxr_linenumber" name="144" href="#144">144</a>     }
+<a class="jxr_linenumber" name="132" href="#132">132</a>         TSOServerConfig tsoConfig = <strong class="jxr_keyword">new</strong> TSOServerConfig();
+<a class="jxr_linenumber" name="133" href="#133">133</a>         tsoConfig.setNumConcurrentCTWriters(32);
+<a class="jxr_linenumber" name="134" href="#134">134</a> 
+<a class="jxr_linenumber" name="135" href="#135">135</a>         PersistenceProcessorHandler[] handlers = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler[tsoConfig.getNumConcurrentCTWriters()];
+<a class="jxr_linenumber" name="136" href="#136">136</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; tsoConfig.getNumConcurrentCTWriters(); i++) {
+<a class="jxr_linenumber" name="137" href="#137">137</a>             handlers[i] = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
+<a class="jxr_linenumber" name="138" href="#138">138</a>                                                           <span class="jxr_string">"localhost:1234"</span>,
+<a class="jxr_linenumber" name="139" href="#139">139</a>                                                           mock(LeaseManager.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="140" href="#140">140</a>                                                           commitTable,
+<a class="jxr_linenumber" name="141" href="#141">141</a>                                                           mock(ReplyProcessor.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="142" href="#142">142</a>                                                           retryProcessor,
+<a class="jxr_linenumber" name="143" href="#143">143</a>                                                           panicker);
+<a class="jxr_linenumber" name="144" href="#144">144</a>         }
 <a class="jxr_linenumber" name="145" href="#145">145</a> 
-<a class="jxr_linenumber" name="146" href="#146">146</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="147" href="#147">147</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithASingleTimestampEvent() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="148" href="#148">148</a> 
-<a class="jxr_linenumber" name="149" href="#149">149</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="150" href="#150">150</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="151" href="#151">151</a>         batch.addTimestamp(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="152" href="#152">152</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="153" href="#153">153</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="154" href="#154">154</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="155" href="#155">155</a> 
-<a class="jxr_linenumber" name="156" href="#156">156</a>         verify(persistenceHandler, times(1)).flush(eq(0));
-<a class="jxr_linenumber" name="157" href="#157">157</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="158" href="#158">158</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="159" href="#159">159</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="160" href="#160">160</a>         assertEquals(batch.getNumEvents(), 1);
-<a class="jxr_linenumber" name="161" href="#161">161</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
-<a class="jxr_linenumber" name="162" href="#162">162</a> 
-<a class="jxr_linenumber" name="163" href="#163">163</a>     }
-<a class="jxr_linenumber" name="164" href="#164">164</a> 
-<a class="jxr_linenumber" name="165" href="#165">165</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="166" href="#166">166</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithASingleCommitEvent() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="146" href="#146">146</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; tsoConfig.getNumConcurrentCTWriters(); i++) {
+<a class="jxr_linenumber" name="147" href="#147">147</a>             <em class="jxr_comment">// Required to generalize the cases when other tests have increased the static variable assigning the ids</em>
+<a class="jxr_linenumber" name="148" href="#148">148</a>             <strong class="jxr_keyword">if</strong> (i + 1 &lt; tsoConfig.getNumConcurrentCTWriters()) {
+<a class="jxr_linenumber" name="149" href="#149">149</a>                 <strong class="jxr_keyword">int</strong> followingHandlerIdAsInt = Integer.valueOf(handlers[i + 1].getId());
+<a class="jxr_linenumber" name="150" href="#150">150</a>                 assertEquals(handlers[i].getId(), String.valueOf(followingHandlerIdAsInt - 1));
+<a class="jxr_linenumber" name="151" href="#151">151</a>             } <strong class="jxr_keyword">else</strong> { <em class="jxr_comment">// Final case: compare with the last element that the sequence creator assigned</em>
+<a class="jxr_linenumber" name="152" href="#152">152</a>                 <strong class="jxr_keyword">int</strong> followingHandlerIdAsInt = PersistenceProcessorHandler.consecutiveSequenceCreator.get();
+<a class="jxr_linenumber" name="153" href="#153">153</a>                 assertEquals(handlers[i].getId(), String.valueOf(followingHandlerIdAsInt - 1));
+<a class="jxr_linenumber" name="154" href="#154">154</a>             }
+<a class="jxr_linenumber" name="155" href="#155">155</a>         }
+<a class="jxr_linenumber" name="156" href="#156">156</a> 
+<a class="jxr_linenumber" name="157" href="#157">157</a>     }
+<a class="jxr_linenumber" name="158" href="#158">158</a> 
+<a class="jxr_linenumber" name="159" href="#159">159</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="160" href="#160">160</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfEmptyBatchPersistEvent() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="161" href="#161">161</a> 
+<a class="jxr_linenumber" name="162" href="#162">162</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="163" href="#163">163</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="164" href="#164">164</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="165" href="#165">165</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="166" href="#166">166</a>         persistenceHandler.onEvent(batchEvent);
 <a class="jxr_linenumber" name="167" href="#167">167</a> 
-<a class="jxr_linenumber" name="168" href="#168">168</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="169" href="#169">169</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="170" href="#170">170</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="171" href="#171">171</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="172" href="#172">172</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="173" href="#173">173</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="174" href="#174">174</a> 
-<a class="jxr_linenumber" name="175" href="#175">175</a>         verify(persistenceHandler, times(1)).flush(eq(1));
-<a class="jxr_linenumber" name="176" href="#176">176</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
-<a class="jxr_linenumber" name="177" href="#177">177</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="178" href="#178">178</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="179" href="#179">179</a>         assertEquals(batch.getNumEvents(), 1);
-<a class="jxr_linenumber" name="180" href="#180">180</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
-<a class="jxr_linenumber" name="181" href="#181">181</a>         assertEquals(batch.get(0).getCommitTimestamp(), FIRST_CT);
-<a class="jxr_linenumber" name="182" href="#182">182</a> 
-<a class="jxr_linenumber" name="183" href="#183">183</a>     }
-<a class="jxr_linenumber" name="184" href="#184">184</a> 
-<a class="jxr_linenumber" name="185" href="#185">185</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="186" href="#186">186</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithASingleAbortEventNoRetry() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="187" href="#187">187</a> 
-<a class="jxr_linenumber" name="188" href="#188">188</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="189" href="#189">189</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="190" href="#190">190</a>         batch.addAbort(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="191" href="#191">191</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="192" href="#192">192</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="193" href="#193">193</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="168" href="#168">168</a>         verify(persistenceHandler, times(1)).flush(eq(0));
+<a class="jxr_linenumber" name="169" href="#169">169</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
+<a class="jxr_linenumber" name="170" href="#170">170</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="171" href="#171">171</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="172" href="#172">172</a>         assertTrue(batch.isEmpty());
+<a class="jxr_linenumber" name="173" href="#173">173</a> 
+<a class="jxr_linenumber" name="174" href="#174">174</a>     }
+<a class="jxr_linenumber" name="175" href="#175">175</a> 
+<a class="jxr_linenumber" name="176" href="#176">176</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="177" href="#177">177</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithASingleTimestampEvent() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="178" href="#178">178</a> 
+<a class="jxr_linenumber" name="179" href="#179">179</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="180" href="#180">180</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="181" href="#181">181</a>         batch.addTimestamp(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="182" href="#182">182</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="183" href="#183">183</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="184" href="#184">184</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="185" href="#185">185</a> 
+<a class="jxr_linenumber" name="186" href="#186">186</a>         verify(persistenceHandler, times(1)).flush(eq(0));
+<a class="jxr_linenumber" name="187" href="#187">187</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
+<a class="jxr_linenumber" name="188" href="#188">188</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="189" href="#189">189</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="190" href="#190">190</a>         assertEquals(batch.getNumEvents(), 1);
+<a class="jxr_linenumber" name="191" href="#191">191</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
+<a class="jxr_linenumber" name="192" href="#192">192</a> 
+<a class="jxr_linenumber" name="193" href="#193">193</a>     }
 <a class="jxr_linenumber" name="194" href="#194">194</a> 
-<a class="jxr_linenumber" name="195" href="#195">195</a>         verify(persistenceHandler, times(1)).flush(eq(0));
-<a class="jxr_linenumber" name="196" href="#196">196</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
-<a class="jxr_linenumber" name="197" href="#197">197</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="198" href="#198">198</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="199" href="#199">199</a>         assertEquals(batch.getNumEvents(), 1);
-<a class="jxr_linenumber" name="200" href="#200">200</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
-<a class="jxr_linenumber" name="201" href="#201">201</a> 
-<a class="jxr_linenumber" name="202" href="#202">202</a>     }
-<a class="jxr_linenumber" name="203" href="#203">203</a> 
-<a class="jxr_linenumber" name="204" href="#204">204</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="205" href="#205">205</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithASingleCommitRetryEvent() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="206" href="#206">206</a> 
-<a class="jxr_linenumber" name="207" href="#207">207</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="208" href="#208">208</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="209" href="#209">209</a>         batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="210" href="#210">210</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="211" href="#211">211</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="195" href="#195">195</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="196" href="#196">196</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithASingleCommitEvent() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="197" href="#197">197</a> 
+<a class="jxr_linenumber" name="198" href="#198">198</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="199" href="#199">199</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="200" href="#200">200</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="201" href="#201">201</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="202" href="#202">202</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="203" href="#203">203</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="204" href="#204">204</a> 
+<a class="jxr_linenumber" name="205" href="#205">205</a>         verify(persistenceHandler, times(1)).flush(eq(1));
+<a class="jxr_linenumber" name="206" href="#206">206</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
+<a class="jxr_linenumber" name="207" href="#207">207</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="208" href="#208">208</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="209" href="#209">209</a>         assertEquals(batch.getNumEvents(), 1);
+<a class="jxr_linenumber" name="210" href="#210">210</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
+<a class="jxr_linenumber" name="211" href="#211">211</a>         assertEquals(batch.get(0).getCommitTimestamp(), FIRST_CT);
 <a class="jxr_linenumber" name="212" href="#212">212</a> 
-<a class="jxr_linenumber" name="213" href="#213">213</a>         <em class="jxr_comment">// Call process method</em>
-<a class="jxr_linenumber" name="214" href="#214">214</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="215" href="#215">215</a> 
-<a class="jxr_linenumber" name="216" href="#216">216</a>         verify(persistenceHandler, times(1)).flush(eq(0));
-<a class="jxr_linenumber" name="217" href="#217">217</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
-<a class="jxr_linenumber" name="218" href="#218">218</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="219" href="#219">219</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="220" href="#220">220</a>         assertEquals(batch.getNumEvents(), 0);
-<a class="jxr_linenumber" name="221" href="#221">221</a> 
-<a class="jxr_linenumber" name="222" href="#222">222</a>     }
-<a class="jxr_linenumber" name="223" href="#223">223</a> 
-<a class="jxr_linenumber" name="224" href="#224">224</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="225" href="#225">225</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWith2EventsCommitAndCommitRetry() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="226" href="#226">226</a> 
-<a class="jxr_linenumber" name="227" href="#227">227</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="228" href="#228">228</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="229" href="#229">229</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="230" href="#230">230</a>         batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="231" href="#231">231</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="232" href="#232">232</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="213" href="#213">213</a>     }
+<a class="jxr_linenumber" name="214" href="#214">214</a> 
+<a class="jxr_linenumber" name="215" href="#215">215</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="216" href="#216">216</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithASingleAbortEventNoRetry() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="217" href="#217">217</a> 
+<a class="jxr_linenumber" name="218" href="#218">218</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="219" href="#219">219</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="220" href="#220">220</a>         batch.addAbort(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="221" href="#221">221</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="222" href="#222">222</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="223" href="#223">223</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="224" href="#224">224</a> 
+<a class="jxr_linenumber" name="225" href="#225">225</a>         verify(persistenceHandler, times(1)).flush(eq(0));
+<a class="jxr_linenumber" name="226" href="#226">226</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
+<a class="jxr_linenumber" name="227" href="#227">227</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="228" href="#228">228</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="229" href="#229">229</a>         assertEquals(batch.getNumEvents(), 1);
+<a class="jxr_linenumber" name="230" href="#230">230</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
+<a class="jxr_linenumber" name="231" href="#231">231</a> 
+<a class="jxr_linenumber" name="232" href="#232">232</a>     }
 <a class="jxr_linenumber" name="233" href="#233">233</a> 
-<a class="jxr_linenumber" name="234" href="#234">234</a>         <em class="jxr_comment">// Initial assertion</em>
-<a class="jxr_linenumber" name="235" href="#235">235</a>         assertEquals(batch.getNumEvents(), 2);
+<a class="jxr_linenumber" name="234" href="#234">234</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="235" href="#235">235</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithASingleCommitRetryEvent() <strong class="jxr_keyword">throws</strong> Exception {
 <a class="jxr_linenumber" name="236" href="#236">236</a> 
-<a class="jxr_linenumber" name="237" href="#237">237</a>         <em class="jxr_comment">// Call process method</em>
-<a class="jxr_linenumber" name="238" href="#238">238</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="239" href="#239">239</a> 
-<a class="jxr_linenumber" name="240" href="#240">240</a>         verify(persistenceHandler, times(1)).flush(eq(1));
-<a class="jxr_linenumber" name="241" href="#241">241</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="242" href="#242">242</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="243" href="#243">243</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="244" href="#244">244</a>         assertEquals(batch.getNumEvents(), 1);
-<a class="jxr_linenumber" name="245" href="#245">245</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
-<a class="jxr_linenumber" name="246" href="#246">246</a>         assertEquals(batch.get(0).getCommitTimestamp(), FIRST_CT);
-<a class="jxr_linenumber" name="247" href="#247">247</a> 
-<a class="jxr_linenumber" name="248" href="#248">248</a>     }
-<a class="jxr_linenumber" name="249" href="#249">249</a> 
-<a class="jxr_linenumber" name="250" href="#250">250</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="251" href="#251">251</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWith2EventsCommitRetryAndCommit() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="252" href="#252">252</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="253" href="#253">253</a>         <em class="jxr_comment">// Same test as testProcessingOfBatchPersistEventWith2EventsCommitAndCommitRetry but swapped events</em>
-<a class="jxr_linenumber" name="254" href="#254">254</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="255" href="#255">255</a> 
-<a class="jxr_linenumber" name="256" href="#256">256</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="257" href="#257">257</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="258" href="#258">258</a>         batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="259" href="#259">259</a>         batch.addCommit(SECOND_ST, SECOND_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="260" href="#260">260</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="261" href="#261">261</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="262" href="#262">262</a> 
-<a class="jxr_linenumber" name="263" href="#263">263</a>         <em class="jxr_comment">// Initial assertion</em>
-<a class="jxr_linenumber" name="264" href="#264">264</a>         assertEquals(batch.getNumEvents(), 2);
-<a class="jxr_linenumber" name="265" href="#265">265</a> 
-<a class="jxr_linenumber" name="266" href="#266">266</a>         <em class="jxr_comment">// Call process method</em>
-<a class="jxr_linenumber" name="267" href="#267">267</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="268" href="#268">268</a> 
-<a class="jxr_linenumber" name="269" href="#269">269</a>         verify(persistenceHandler, times(1)).flush(eq(1));
-<a class="jxr_linenumber" name="270" href="#270">270</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="271" href="#271">271</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="272" href="#272">272</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="273" href="#273">273</a>         assertEquals(batch.getNumEvents(), 1);
-<a class="jxr_linenumber" name="274" href="#274">274</a>         assertEquals(batch.get(0).getStartTimestamp(), SECOND_ST);
-<a class="jxr_linenumber" name="275" href="#275">275</a>         assertEquals(batch.get(0).getCommitTimestamp(), SECOND_CT);
-<a class="jxr_linenumber" name="276" href="#276">276</a> 
-<a class="jxr_linenumber" name="277" href="#277">277</a>     }
-<a class="jxr_linenumber" name="278" href="#278">278</a> 
-<a class="jxr_linenumber" name="279" href="#279">279</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="280" href="#280">280</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWith2CommitRetryEvents() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="281" href="#281">281</a> 
-<a class="jxr_linenumber" name="282" href="#282">282</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="283" href="#283">283</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="284" href="#284">284</a>         batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="285" href="#285">285</a>         batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="286" href="#286">286</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="287" href="#287">287</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="288" href="#288">288</a> 
-<a class="jxr_linenumber" name="289" href="#289">289</a>         <em class="jxr_comment">// Initial assertion</em>
-<a class="jxr_linenumber" name="290" href="#290">290</a>         assertEquals(batch.getNumEvents(), 2);
-<a class="jxr_linenumber" name="291" href="#291">291</a> 
-<a class="jxr_linenumber" name="292" href="#292">292</a>         <em class="jxr_comment">// Call process method</em>
-<a class="jxr_linenumber" name="293" href="#293">293</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="294" href="#294">294</a> 
-<a class="jxr_linenumber" name="295" href="#295">295</a>         verify(persistenceHandler, times(1)).flush(eq(0));
-<a class="jxr_linenumber" name="296" href="#296">296</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="297" href="#297">297</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="298" href="#298">298</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="299" href="#299">299</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="300" href="#300">300</a>         assertEquals(batch.getNumEvents(), 0);
-<a class="jxr_linenumber" name="301" href="#301">301</a> 
-<a class="jxr_linenumber" name="302" href="#302">302</a>     }
-<a class="jxr_linenumber" name="303" href="#303">303</a> 
-<a class="jxr_linenumber" name="304" href="#304">304</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="305" href="#305">305</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWith2AbortEvents() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="237" href="#237">237</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="238" href="#238">238</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="239" href="#239">239</a>         batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="240" href="#240">240</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="241" href="#241">241</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="242" href="#242">242</a> 
+<a class="jxr_linenumber" name="243" href="#243">243</a>         <em class="jxr_comment">// Call process method</em>
+<a class="jxr_linenumber" name="244" href="#244">244</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="245" href="#245">245</a> 
+<a class="jxr_linenumber" name="246" href="#246">246</a>         verify(persistenceHandler, times(1)).flush(eq(0));
+<a class="jxr_linenumber" name="247" href="#247">247</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
+<a class="jxr_linenumber" name="248" href="#248">248</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="249" href="#249">249</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="250" href="#250">250</a>         assertEquals(batch.getNumEvents(), 0);
+<a class="jxr_linenumber" name="251" href="#251">251</a> 
+<a class="jxr_linenumber" name="252" href="#252">252</a>     }
+<a class="jxr_linenumber" name="253" href="#253">253</a> 
+<a class="jxr_linenumber" name="254" href="#254">254</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="255" href="#255">255</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWith2EventsCommitAndCommitRetry() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="256" href="#256">256</a> 
+<a class="jxr_linenumber" name="257" href="#257">257</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="258" href="#258">258</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="259" href="#259">259</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="260" href="#260">260</a>         batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="261" href="#261">261</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="262" href="#262">262</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="263" href="#263">263</a> 
+<a class="jxr_linenumber" name="264" href="#264">264</a>         <em class="jxr_comment">// Initial assertion</em>
+<a class="jxr_linenumber" name="265" href="#265">265</a>         assertEquals(batch.getNumEvents(), 2);
+<a class="jxr_linenumber" name="266" href="#266">266</a> 
+<a class="jxr_linenumber" name="267" href="#267">267</a>         <em class="jxr_comment">// Call process method</em>
+<a class="jxr_linenumber" name="268" href="#268">268</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="269" href="#269">269</a> 
+<a class="jxr_linenumber" name="270" href="#270">270</a>         verify(persistenceHandler, times(1)).flush(eq(1));
+<a class="jxr_linenumber" name="271" href="#271">271</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
+<a class="jxr_linenumber" name="272" href="#272">272</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="273" href="#273">273</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="274" href="#274">274</a>         assertEquals(batch.getNumEvents(), 1);
+<a class="jxr_linenumber" name="275" href="#275">275</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
+<a class="jxr_linenumber" name="276" href="#276">276</a>         assertEquals(batch.get(0).getCommitTimestamp(), FIRST_CT);
+<a class="jxr_linenumber" name="277" href="#277">277</a> 
+<a class="jxr_linenumber" name="278" href="#278">278</a>     }
+<a class="jxr_linenumber" name="279" href="#279">279</a> 
+<a class="jxr_linenumber" name="280" href="#280">280</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="281" href="#281">281</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWith2EventsCommitRetryAndCommit() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="282" href="#282">282</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="283" href="#283">283</a>         <em class="jxr_comment">// Same test as testProcessingOfBatchPersistEventWith2EventsCommitAndCommitRetry but swapped events</em>
+<a class="jxr_linenumber" name="284" href="#284">284</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="285" href="#285">285</a> 
+<a class="jxr_linenumber" name="286" href="#286">286</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="287" href="#287">287</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="288" href="#288">288</a>         batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="289" href="#289">289</a>         batch.addCommit(SECOND_ST, SECOND_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="290" href="#290">290</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="291" href="#291">291</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="292" href="#292">292</a> 
+<a class="jxr_linenumber" name="293" href="#293">293</a>         <em class="jxr_comment">// Initial assertion</em>
+<a class="jxr_linenumber" name="294" href="#294">294</a>         assertEquals(batch.getNumEvents(), 2);
+<a class="jxr_linenumber" name="295" href="#295">295</a> 
+<a class="jxr_linenumber" name="296" href="#296">296</a>         <em class="jxr_comment">// Call process method</em>
+<a class="jxr_linenumber" name="297" href="#297">297</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="298" href="#298">298</a> 
+<a class="jxr_linenumber" name="299" href="#299">299</a>         verify(persistenceHandler, times(1)).flush(eq(1));
+<a class="jxr_linenumber" name="300" href="#300">300</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
+<a class="jxr_linenumber" name="301" href="#301">301</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="302" href="#302">302</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="303" href="#303">303</a>         assertEquals(batch.getNumEvents(), 1);
+<a class="jxr_linenumber" name="304" href="#304">304</a>         assertEquals(batch.get(0).getStartTimestamp(), SECOND_ST);
+<a class="jxr_linenumber" name="305" href="#305">305</a>         assertEquals(batch.get(0).getCommitTimestamp(), SECOND_CT);
 <a class="jxr_linenumber" name="306" href="#306">306</a> 
-<a class="jxr_linenumber" name="307" href="#307">307</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="308" href="#308">308</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="309" href="#309">309</a>         batch.addAbort(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="310" href="#310">310</a>         batch.addAbort(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="311" href="#311">311</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="312" href="#312">312</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="313" href="#313">313</a> 
-<a class="jxr_linenumber" name="314" href="#314">314</a>         <em class="jxr_comment">// Initial assertion</em>
-<a class="jxr_linenumber" name="315" href="#315">315</a>         assertEquals(batch.getNumEvents(), 2);
-<a class="jxr_linenumber" name="316" href="#316">316</a> 
-<a class="jxr_linenumber" name="317" href="#317">317</a>         <em class="jxr_comment">// Call process method</em>
-<a class="jxr_linenumber" name="318" href="#318">318</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="319" href="#319">319</a> 
-<a class="jxr_linenumber" name="320" href="#320">320</a>         verify(persistenceHandler, times(1)).flush(eq(0));
-<a class="jxr_linenumber" name="321" href="#321">321</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="322" href="#322">322</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="323" href="#323">323</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="324" href="#324">324</a>         assertEquals(batch.getNumEvents(), 2);
-<a class="jxr_linenumber" name="325" href="#325">325</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
-<a class="jxr_linenumber" name="326" href="#326">326</a>         assertEquals(batch.get(1).getStartTimestamp(), SECOND_ST);
-<a class="jxr_linenumber" name="327" href="#327">327</a> 
-<a class="jxr_linenumber" name="328" href="#328">328</a>     }
-<a class="jxr_linenumber" name="329" href="#329">329</a> 
-<a class="jxr_linenumber" name="330" href="#330">330</a> 
-<a class="jxr_linenumber" name="331" href="#331">331</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="332" href="#332">332</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithMultipleRetryAndNonRetryEvents() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="307" href="#307">307</a>     }
+<a class="jxr_linenumber" name="308" href="#308">308</a> 
+<a class="jxr_linenumber" name="309" href="#309">309</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="310" href="#310">310</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWith2CommitRetryEvents() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="311" href="#311">311</a> 
+<a class="jxr_linenumber" name="312" href="#312">312</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="313" href="#313">313</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="314" href="#314">314</a>         batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="315" href="#315">315</a>         batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="316" href="#316">316</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="317" href="#317">317</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="318" href="#318">318</a> 
+<a class="jxr_linenumber" name="319" href="#319">319</a>         <em class="jxr_comment">// Initial assertion</em>
+<a class="jxr_linenumber" name="320" href="#320">320</a>         assertEquals(batch.getNumEvents(), 2);
+<a class="jxr_linenumber" name="321" href="#321">321</a> 
+<a class="jxr_linenumber" name="322" href="#322">322</a>         <em class="jxr_comment">// Call process method</em>
+<a class="jxr_linenumber" name="323" href="#323">323</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="324" href="#324">324</a> 
+<a class="jxr_linenumber" name="325" href="#325">325</a>         verify(persistenceHandler, times(1)).flush(eq(0));
+<a class="jxr_linenumber" name="326" href="#326">326</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
+<a class="jxr_linenumber" name="327" href="#327">327</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="328" href="#328">328</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="329" href="#329">329</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="330" href="#330">330</a>         assertEquals(batch.getNumEvents(), 0);
+<a class="jxr_linenumber" name="331" href="#331">331</a> 
+<a class="jxr_linenumber" name="332" href="#332">332</a>     }
 <a class="jxr_linenumber" name="333" href="#333">333</a> 
-<a class="jxr_linenumber" name="334" href="#334">334</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="335" href="#335">335</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="334" href="#334">334</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="335" href="#335">335</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWith2AbortEvents() <strong class="jxr_keyword">throws</strong> Exception {
 <a class="jxr_linenumber" name="336" href="#336">336</a> 
-<a class="jxr_linenumber" name="337" href="#337">337</a>         batch.addTimestamp(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="338" href="#338">338</a>         batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="339" href="#339">339</a>         batch.addCommit(THIRD_ST, THIRD_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="340" href="#340">340</a>         batch.addAbort(FOURTH_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="341" href="#341">341</a>         batch.addCommit(FIFTH_ST, FIFTH_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="342" href="#342">342</a>         batch.addCommitRetry(SIXTH_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="343" href="#343">343</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="344" href="#344">344</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="345" href="#345">345</a> 
-<a class="jxr_linenumber" name="346" href="#346">346</a>         <em class="jxr_comment">// Initial assertion</em>
-<a class="jxr_linenumber" name="347" href="#347">347</a>         assertEquals(batch.getNumEvents(), 6);
-<a class="jxr_linenumber" name="348" href="#348">348</a> 
-<a class="jxr_linenumber" name="349" href="#349">349</a>         <em class="jxr_comment">// Call process method</em>
-<a class="jxr_linenumber" name="350" href="#350">350</a>         persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="351" href="#351">351</a> 
-<a class="jxr_linenumber" name="352" href="#352">352</a>         verify(persistenceHandler, times(1)).flush(2); <em class="jxr_comment">// 2 commits to flush</em>
-<a class="jxr_linenumber" name="353" href="#353">353</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="354" href="#354">354</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="355" href="#355">355</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
-<a class="jxr_linenumber" name="356" href="#356">356</a>         assertEquals(batch.getNumEvents(), 4);
-<a class="jxr_linenumber" name="357" href="#357">357</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
-<a class="jxr_linenumber" name="358" href="#358">358</a>         assertEquals(batch.get(1).getStartTimestamp(), FIFTH_ST);
-<a class="jxr_linenumber" name="359" href="#359">359</a>         assertEquals(batch.get(1).getCommitTimestamp(), FIFTH_CT);
-<a class="jxr_linenumber" name="360" href="#360">360</a>         assertEquals(batch.get(2).getStartTimestamp(), THIRD_ST);
-<a class="jxr_linenumber" name="361" href="#361">361</a>         assertEquals(batch.get(2).getCommitTimestamp(), THIRD_CT);
-<a class="jxr_linenumber" name="362" href="#362">362</a>         assertEquals(batch.get(3).getStartTimestamp(), FOURTH_ST);
+<a class="jxr_linenumber" name="337" href="#337">337</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="338" href="#338">338</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="339" href="#339">339</a>         batch.addAbort(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="340" href="#340">340</a>         batch.addAbort(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="341" href="#341">341</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="342" href="#342">342</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="343" href="#343">343</a> 
+<a class="jxr_linenumber" name="344" href="#344">344</a>         <em class="jxr_comment">// Initial assertion</em>
+<a class="jxr_linenumber" name="345" href="#345">345</a>         assertEquals(batch.getNumEvents(), 2);
+<a class="jxr_linenumber" name="346" href="#346">346</a> 
+<a class="jxr_linenumber" name="347" href="#347">347</a>         <em class="jxr_comment">// Call process method</em>
+<a class="jxr_linenumber" name="348" href="#348">348</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="349" href="#349">349</a> 
+<a class="jxr_linenumber" name="350" href="#350">350</a>         verify(persistenceHandler, times(1)).flush(eq(0));
+<a class="jxr_linenumber" name="351" href="#351">351</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
+<a class="jxr_linenumber" name="352" href="#352">352</a>         verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="353" href="#353">353</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="354" href="#354">354</a>         assertEquals(batch.getNumEvents(), 2);
+<a class="jxr_linenumber" name="355" href="#355">355</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
+<a class="jxr_linenumber" name="356" href="#356">356</a>         assertEquals(batch.get(1).getStartTimestamp(), SECOND_ST);
+<a class="jxr_linenumber" name="357" href="#357">357</a> 
+<a class="jxr_linenumber" name="358" href="#358">358</a>     }
+<a class="jxr_linenumber" name="359" href="#359">359</a> 
+<a class="jxr_linenumber" name="360" href="#360">360</a> 
+<a class="jxr_linenumber" name="361" href="#361">361</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="362" href="#362">362</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProcessingOfBatchPersistEventWithMultipleRetryAndNonRetryEvents() <strong class="jxr_keyword">throws</strong> Exception {
 <a class="jxr_linenumber" name="363" href="#363">363</a> 
-<a class="jxr_linenumber" name="364" href="#364">364</a>     }
-<a class="jxr_linenumber" name="365" href="#365">365</a> 
-<a class="jxr_linenumber" name="366" href="#366">366</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="367" href="#367">367</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPanicPersistingEvents() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="368" href="#368">368</a> 
-<a class="jxr_linenumber" name="369" href="#369">369</a>         <em class="jxr_comment">// User the real panicker</em>
-<a class="jxr_linenumber" name="370" href="#370">370</a>         Panicker panicker = spy(<strong class="jxr_keyword">new</strong> RuntimeExceptionPanicker());
-<a class="jxr_linenumber" name="371" href="#371">371</a>         persistenceHandler = spy(<strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
-<a class="jxr_linenumber" name="372" href="#372">372</a>                                                                  <span class="jxr_string">"localhost:1234"</span>,
-<a class="jxr_linenumber" name="373" href="#373">373</a>                                                                  leaseManager,
-<a class="jxr_linenumber" name="374" href="#374">374</a>                                                                  commitTable,
-<a class="jxr_linenumber" name="375" href="#375">375</a>                                                                  replyProcessor,
-<a class="jxr_linenumber" name="376" href="#376">376</a>                                                                  retryProcessor,
-<a class="jxr_linenumber" name="377" href="#377">377</a>                                                                  panicker));
+<a class="jxr_linenumber" name="364" href="#364">364</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="365" href="#365">365</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="366" href="#366">366</a> 
+<a class="jxr_linenumber" name="367" href="#367">367</a>         batch.addTimestamp(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="368" href="#368">368</a>         batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="369" href="#369">369</a>         batch.addCommit(THIRD_ST, THIRD_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="370" href="#370">370</a>         batch.addAbort(FOURTH_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="371" href="#371">371</a>         batch.addCommit(FIFTH_ST, FIFTH_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="372" href="#372">372</a>         batch.addCommitRetry(SIXTH_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="373" href="#373">373</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="374" href="#374">374</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="375" href="#375">375</a> 
+<a class="jxr_linenumber" name="376" href="#376">376</a>         <em class="jxr_comment">// Initial assertion</em>
+<a class="jxr_linenumber" name="377" href="#377">377</a>         assertEquals(batch.getNumEvents(), 6);
 <a class="jxr_linenumber" name="378" href="#378">378</a> 
-<a class="jxr_linenumber" name="379" href="#379">379</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="380" href="#380">380</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="381" href="#381">381</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="382" href="#382">382</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="383" href="#383">383</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="384" href="#384">384</a> 
-<a class="jxr_linenumber" name="385" href="#385">385</a>         doThrow(IOException.<strong class="jxr_keyword">class</strong>).when(mockWriter).flush();
-<a class="jxr_linenumber" name="386" href="#386">386</a> 
-<a class="jxr_linenumber" name="387" href="#387">387</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="388" href="#388">388</a>             persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="389" href="#389">389</a>             fail();
-<a class="jxr_linenumber" name="390" href="#390">390</a>         } <strong class="jxr_keyword">catch</strong> (RuntimeException re) {
-<a class="jxr_linenumber" name="391" href="#391">391</a>             <em class="jxr_comment">// Expected</em>
-<a class="jxr_linenumber" name="392" href="#392">392</a>         }
+<a class="jxr_linenumber" name="379" href="#379">379</a>         <em class="jxr_comment">// Call process method</em>
+<a class="jxr_linenumber" name="380" href="#380">380</a>         persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="381" href="#381">381</a> 
+<a class="jxr_linenumber" name="382" href="#382">382</a>         verify(persistenceHandler, times(1)).flush(2); <em class="jxr_comment">// 2 commits to flush</em>
+<a class="jxr_linenumber" name="383" href="#383">383</a>         verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
+<a class="jxr_linenumber" name="384" href="#384">384</a>         verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="385" href="#385">385</a>         verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
+<a class="jxr_linenumber" name="386" href="#386">386</a>         assertEquals(batch.getNumEvents(), 4);
+<a class="jxr_linenumber" name="387" href="#387">387</a>         assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
+<a class="jxr_linenumber" name="388" href="#388">388</a>         assertEquals(batch.get(1).getStartTimestamp(), FIFTH_ST);
+<a class="jxr_linenumber" name="389" href="#389">389</a>         assertEquals(batch.get(1).getCommitTimestamp(), FIFTH_CT);
+<a class="jxr_linenumber" name="390" href="#390">390</a>         assertEquals(batch.get(2).getStartTimestamp(), THIRD_ST);
+<a class="jxr_linenumber" name="391" href="#391">391</a>         assertEquals(batch.get(2).getCommitTimestamp(), THIRD_CT);
+<a class="jxr_linenumber" name="392" href="#392">392</a>         assertEquals(batch.get(3).getStartTimestamp(), FOURTH_ST);
 <a class="jxr_linenumber" name="393" href="#393">393</a> 
-<a class="jxr_linenumber" name="394" href="#394">394</a>         verify(persistenceHandler, times(1)).flush(1);
-<a class="jxr_linenumber" name="395" href="#395">395</a>         verify(panicker, times(1)).panic(eq(<span class="jxr_string">"Error persisting commit batch"</span>), any(IOException.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="396" href="#396">396</a>         verify(persistenceHandler, never()).filterAndDissambiguateClientRetries(any(Batch.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="397" href="#397">397</a>         verify(replyProcessor, never()).manageResponsesBatch(anyLong(), any(Batch.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="394" href="#394">394</a>     }
+<a class="jxr_linenumber" name="395" href="#395">395</a> 
+<a class="jxr_linenumber" name="396" href="#396">396</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="397" href="#397">397</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPanicPersistingEvents() <strong class="jxr_keyword">throws</strong> Exception {
 <a class="jxr_linenumber" name="398" href="#398">398</a> 
-<a class="jxr_linenumber" name="399" href="#399">399</a>     }
-<a class="jxr_linenumber" name="400" href="#400">400</a> 
-<a class="jxr_linenumber" name="401" href="#401">401</a>     @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="402" href="#402">402</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPanicBecauseMasterLosesMastership() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="403" href="#403">403</a> 
-<a class="jxr_linenumber" name="404" href="#404">404</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="405" href="#405">405</a>         <em class="jxr_comment">// 1) Test panic before flushing</em>
-<a class="jxr_linenumber" name="406" href="#406">406</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="407" href="#407">407</a> 
-<a class="jxr_linenumber" name="408" href="#408">408</a>         <em class="jxr_comment">// Simulate we lose mastership BEFORE flushing</em>
-<a class="jxr_linenumber" name="409" href="#409">409</a>         doReturn(false).when(leaseManager).stillInLeasePeriod();
-<a class="jxr_linenumber" name="410" href="#410">410</a> 
-<a class="jxr_linenumber" name="411" href="#411">411</a>         <em class="jxr_comment">// User the real panicker</em>
-<a class="jxr_linenumber" name="412" href="#412">412</a>         Panicker panicker = spy(<strong class="jxr_keyword">new</strong> RuntimeExceptionPanicker());
-<a class="jxr_linenumber" name="413" href="#413">413</a>         persistenceHandler = spy(<strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
-<a class="jxr_linenumber" name="414" href="#414">414</a>                                                                  <span class="jxr_string">"localhost:1234"</span>,
-<a class="jxr_linenumber" name="415" href="#415">415</a>                                                                  leaseManager,
-<a class="jxr_linenumber" name="416" href="#416">416</a>                                                                  commitTable,
-<a class="jxr_linenumber" name="417" href="#417">417</a>                                                                  replyProcessor,
-<a class="jxr_linenumber" name="418" href="#418">418</a>                                                                  retryProcessor,
-<a class="jxr_linenumber" name="419" href="#419">419</a>                                                                  panicker));
-<a class="jxr_linenumber" name="420" href="#420">420</a> 
-<a class="jxr_linenumber" name="421" href="#421">421</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="422" href="#422">422</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="423" href="#423">423</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="424" href="#424">424</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="425" href="#425">425</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="426" href="#426">426</a> 
-<a class="jxr_linenumber" name="427" href="#427">427</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="428" href="#428">428</a>             persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="429" href="#429">429</a>             fail();
-<a class="jxr_linenumber" name="430" href="#430">430</a>         } <strong class="jxr_keyword">catch</strong> (RuntimeException re) {
-<a class="jxr_linenumber" name="431" href="#431">431</a>             <em class="jxr_comment">// Expected</em>
-<a class="jxr_linenumber" name="432" href="#432">432</a>         }
-<a class="jxr_linenumber" name="433" href="#433">433</a>         verify(persistenceHandler, times(1)).flush(eq(1));
-<a class="jxr_linenumber" name="434" href="#434">434</a>         verify(mockWriter, never()).flush();
-<a class="jxr_linenumber" name="435" href="#435">435</a>         verify(panicker, times(1)).panic(eq(<span class="jxr_string">"Replica localhost:1234 lost mastership whilst flushing data. Committing suicide"</span>), any(IOException.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="436" href="#436">436</a>         verify(persistenceHandler, never()).filterAndDissambiguateClientRetries(any(Batch.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="437" href="#437">437</a>         verify(replyProcessor, never()).manageResponsesBatch(anyLong(), any(Batch.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="438" href="#438">438</a> 
-<a class="jxr_linenumber" name="439" href="#439">439</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="440" href="#440">440</a>         <em class="jxr_comment">// 2) Test panic after flushing</em>
-<a class="jxr_linenumber" name="441" href="#441">441</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="442" href="#442">442</a> 
-<a class="jxr_linenumber" name="443" href="#443">443</a>         <em class="jxr_comment">// Simulate we lose mastership AFTER flushing</em>
-<a class="jxr_linenumber" name="444" href="#444">444</a>         doReturn(<strong class="jxr_keyword">true</strong>).doReturn(false).when(leaseManager).stillInLeasePeriod();
-<a class="jxr_linenumber" name="445" href="#445">445</a> 
-<a class="jxr_linenumber" name="446" href="#446">446</a>         <em class="jxr_comment">// User the real panicker</em>
-<a class="jxr_linenumber" name="447" href="#447">447</a>         panicker = spy(<strong class="jxr_keyword">new</strong> RuntimeExceptionPanicker());
-<a class="jxr_linenumber" name="448" href="#448">448</a>         persistenceHandler = spy(<strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
-<a class="jxr_linenumber" name="449" href="#449">449</a>                                                                  <span class="jxr_string">"localhost:1234"</span>,
-<a class="jxr_linenumber" name="450" href="#450">450</a>                                                                  leaseManager,
-<a class="jxr_linenumber" name="451" href="#451">451</a>                                                                  commitTable,
-<a class="jxr_linenumber" name="452" href="#452">452</a>                                                                  replyProcessor,
-<a class="jxr_linenumber" name="453" href="#453">453</a>                                                                  retryProcessor,
-<a class="jxr_linenumber" name="454" href="#454">454</a>                                                                  panicker));
-<a class="jxr_linenumber" name="455" href="#455">455</a> 
-<a class="jxr_linenumber" name="456" href="#456">456</a>         <em class="jxr_comment">// Prepare test batch</em>
-<a class="jxr_linenumber" name="457" href="#457">457</a>         batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="458" href="#458">458</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="459" href="#459">459</a>         batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
-<a class="jxr_linenumber" name="460" href="#460">460</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
-<a class="jxr_linenumber" name="461" href="#461">461</a> 
-<a class="jxr_linenumber" name="462" href="#462">462</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="463" href="#463">463</a>             persistenceHandler.onEvent(batchEvent);
-<a class="jxr_linenumber" name="464" href="#464">464</a>             fail();
-<a class="jxr_linenumber" name="465" href="#465">465</a>         } <strong class="jxr_keyword">catch</strong> (RuntimeException re) {
-<a class="jxr_linenumber" name="466" href="#466">466</a>             <em class="jxr_comment">// Expected</em>
-<a class="jxr_linenumber" name="467" href="#467">467</a>         }
-<a class="jxr_linenumber" name="468" href="#468">468</a>         verify(persistenceHandler, times(1)).flush(eq(1));
-<a class="jxr_linenumber" name="469" href="#469">469</a>         verify(mockWriter, times(1)).flush();
-<a class="jxr_linenumber" name="470" href="#470">470</a>         verify(panicker, times(1)).panic(eq(<span class="jxr_string">"Replica localhost:1234 lost mastership whilst flushing data. Committing suicide"</span>), any(IOException.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="471" href="#471">471</a>         verify(persistenceHandler, never()).filterAndDissambiguateClientRetries(any(Batch.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="472" href="#472">472</a>         verify(replyProcessor, never()).manageResponsesBatch(anyLong(), any(Batch.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="473" href="#473">473</a> 
-<a class="jxr_linenumber" name="474" href="#474">474</a>     }
+<a class="jxr_linenumber" name="399" href="#399">399</a>         <em class="jxr_comment">// User the real panicker</em>
+<a class="jxr_linenumber" name="400" href="#400">400</a>         Panicker panicker = spy(<strong class="jxr_keyword">new</strong> RuntimeExceptionPanicker());
+<a class="jxr_linenumber" name="401" href="#401">401</a>         persistenceHandler = spy(<strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
+<a class="jxr_linenumber" name="402" href="#402">402</a>                                                                  <span class="jxr_string">"localhost:1234"</span>,
+<a class="jxr_linenumber" name="403" href="#403">403</a>                                                                  leaseManager,
+<a class="jxr_linenumber" name="404" href="#404">404</a>                                                                  commitTable,
+<a class="jxr_linenumber" name="405" href="#405">405</a>                                                                  replyProcessor,
+<a class="jxr_linenumber" name="406" href="#406">406</a>                                                                  retryProcessor,
+<a class="jxr_linenumber" name="407" href="#407">407</a>                                                                  panicker));
+<a class="jxr_linenumber" name="408" href="#408">408</a> 
+<a class="jxr_linenumber" name="409" href="#409">409</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="410" href="#410">410</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="411" href="#411">411</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="412" href="#412">412</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="413" href="#413">413</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="414" href="#414">414</a> 
+<a class="jxr_linenumber" name="415" href="#415">415</a>         doThrow(IOException.<strong class="jxr_keyword">class</strong>).when(mockWriter).flush();
+<a class="jxr_linenumber" name="416" href="#416">416</a> 
+<a class="jxr_linenumber" name="417" href="#417">417</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="418" href="#418">418</a>             persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="419" href="#419">419</a>             fail();
+<a class="jxr_linenumber" name="420" href="#420">420</a>         } <strong class="jxr_keyword">catch</strong> (RuntimeException re) {
+<a class="jxr_linenumber" name="421" href="#421">421</a>             <em class="jxr_comment">// Expected</em>
+<a class="jxr_linenumber" name="422" href="#422">422</a>         }
+<a class="jxr_linenumber" name="423" href="#423">423</a> 
+<a class="jxr_linenumber" name="424" href="#424">424</a>         verify(persistenceHandler, times(1)).flush(1);
+<a class="jxr_linenumber" name="425" href="#425">425</a>         verify(panicker, times(1)).panic(eq(<span class="jxr_string">"Error persisting commit batch"</span>), any(IOException.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="426" href="#426">426</a>         verify(persistenceHandler, never()).filterAndDissambiguateClientRetries(any(Batch.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="427" href="#427">427</a>         verify(replyProcessor, never()).manageResponsesBatch(anyLong(), any(Batch.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="428" href="#428">428</a> 
+<a class="jxr_linenumber" name="429" href="#429">429</a>     }
+<a class="jxr_linenumber" name="430" href="#430">430</a> 
+<a class="jxr_linenumber" name="431" href="#431">431</a>     @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="432" href="#432">432</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPanicBecauseMasterLosesMastership() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="433" href="#433">433</a> 
+<a class="jxr_linenumber" name="434" href="#434">434</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="435" href="#435">435</a>         <em class="jxr_comment">// 1) Test panic before flushing</em>
+<a class="jxr_linenumber" name="436" href="#436">436</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="437" href="#437">437</a> 
+<a class="jxr_linenumber" name="438" href="#438">438</a>         <em class="jxr_comment">// Simulate we lose mastership BEFORE flushing</em>
+<a class="jxr_linenumber" name="439" href="#439">439</a>         doReturn(false).when(leaseManager).stillInLeasePeriod();
+<a class="jxr_linenumber" name="440" href="#440">440</a> 
+<a class="jxr_linenumber" name="441" href="#441">441</a>         <em class="jxr_comment">// User the real panicker</em>
+<a class="jxr_linenumber" name="442" href="#442">442</a>         Panicker panicker = spy(<strong class="jxr_keyword">new</strong> RuntimeExceptionPanicker());
+<a class="jxr_linenumber" name="443" href="#443">443</a>         persistenceHandler = spy(<strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
+<a class="jxr_linenumber" name="444" href="#444">444</a>                                                                  <span class="jxr_string">"localhost:1234"</span>,
+<a class="jxr_linenumber" name="445" href="#445">445</a>                                                                  leaseManager,
+<a class="jxr_linenumber" name="446" href="#446">446</a>                                                                  commitTable,
+<a class="jxr_linenumber" name="447" href="#447">447</a>                                                                  replyProcessor,
+<a class="jxr_linenumber" name="448" href="#448">448</a>                                                                  retryProcessor,
+<a class="jxr_linenumber" name="449" href="#449">449</a>                                                                  panicker));
+<a class="jxr_linenumber" name="450" href="#450">450</a> 
+<a class="jxr_linenumber" name="451" href="#451">451</a>         <em class="jxr_comment">// Prepare test batch</em>
+<a class="jxr_linenumber" name="452" href="#452">452</a>         Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
+<a class="jxr_linenumber" name="453" href="#453">453</a>         batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="454" href="#454">454</a>         PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
+<a class="jxr_linenumber" name="455" href="#455">455</a>         PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
+<a class="jxr_linenumber" name="456" href="#456">456</a> 
+<a class="jxr_linenumber" name="457" href="#457">457</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="458" href="#458">458</a>             persistenceHandler.onEvent(batchEvent);
+<a class="jxr_linenumber" name="459" href="#459">459</a>             fail();
+<a class="jxr_linenumber" name="460" href="#460">460</a>         } <strong class="jxr_keyword">catch</strong> (RuntimeException re) {
+<a class="jxr_linenumber" name="461" href="#461">461</a>             <em class="jxr_comment">// Expected</em>
+<a class="jxr_linenumber" name="462" href="#462">462</a>         }
+<a class="jxr_linenumber" name="463" href="#463">463</a>         verify(persistenceHandler, times(1)).flush(eq(1));
+<a class="jxr_linenumber" name="464" href="#464">464</a>         verify(mockWriter, never()).flush();
+<a class="jxr_linenumber" name="465" href="#465">465</a>         verify(panicker, times(1)).panic(eq(<span class="jxr_string">"Replica localhost:1234 lost mastership whilst flushing data. Committing suicide"</span>), any(IOException.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="466" href="#466">466</a>         verify(persistenceHandler, never()).filterAndDissambiguateClientRetries(any(Batch.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="467" href="#467">467</a>         verify(replyProcessor, never()).manageResponsesBatch(anyLong(), any(Batch.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="468" href="#468">468</a> 
+<a class="jxr_linenumber" name="469" href="#469">469</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="470" href="#470">470</a>         <em class="jxr_comment">// 2) Test panic after flushing</em>
+<a class="jxr_linenumber" name="471" href="#471">471</a>         <em class="jxr_comment">// ------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="472" href="#472">472</a> 
+<a class="jxr_linenumber" name="473" href="#473">473</a>         <em class="jxr_comment">// Simulate we lose mastership AFTER flushing</em>
+<a class="jxr_linenumber" name="474" href="#474">474</a>         doReturn(<strong class="jxr_keyword">true</strong>).doR

<TRUNCATED>