Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[#9254] DataFile readRecord fallback to OS file.length in rare edge case 

(cherry picked from commit 3e61a200d0)
This commit is contained in:
Matt Pavlovich 2023-05-01 20:08:16 -05:00 committed by Christopher L. Shannon (cshannon)
parent add6356261
commit cd676023cc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java
View File

@ -17,7 +17,6 @@
package org.apache.activemq.store.kahadb.disk.journal; package org.apache.activemq.store.kahadb.disk.journal;
import java.io.IOException; import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.Map; import java.util.Map;
import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.ByteSequence;
@ -85,7 +84,17 @@ final class DataFileAccessor {
file.seek(location.getOffset() + Journal.RECORD_HEAD_SPACE); file.seek(location.getOffset() + Journal.RECORD_HEAD_SPACE);
} }
if ((long)location.getOffset() + location.getSize() > dataFile.length) { if ((long)location.getOffset() + location.getSize() > dataFile.length) {
throw new IOException("Invalid location size: " + location + ", size: " + location.getSize()); /**
* AMQ-9254 if the read request is outside expected dataFile length,
* perform expensive OS file length lookup operation
* to allow read operation if it will succeed
*/
long osFileLength = dataFile.getFile().length();
if((long)location.getOffset() + location.getSize() > osFileLength) {
throw new IOException("Invalid location size: " + location + ", size: " + location.getSize());
} else {
LOG.warn("DataFile:{} actual length:{} larger than expected:{} for readRecord location:{} size:{}", dataFile.file.getName(), osFileLength, dataFile.length, location, location.getSize());
}
} }
byte[] data = new byte[location.getSize() - Journal.RECORD_HEAD_SPACE]; byte[] data = new byte[location.getSize() - Journal.RECORD_HEAD_SPACE];
file.readFully(data); file.readFully(data);