HDFS-3914. QJM: acceptRecovery should abort current segment. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1383148 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3077.txt

@@ -62,3 +62,5 @@ HDFS-3900. QJM: avoid validating log segments on log rolls (todd)
 HDFS-3901. QJM: send 'heartbeat' messages to JNs even when they are out-of-sync (todd)
 
 HDFS-3899. QJM: Add client-side metrics (todd)
+
+HDFS-3914. QJM: acceptRecovery should abort current segment (todd)

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java

@@ -683,6 +683,9 @@ class Journal implements Closeable {
       throws IOException {
     checkFormatted();
     checkRequest(reqInfo);
+    
+    abortCurSegment();
+
     long segmentTxId = segment.getStartTxId();
 
     // TODO: right now, a recovery of a segment when the log is