Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

Don't overwrite Chronicle Map header, if it's checksum is correct

Browse Source
This commit is contained in:
leventov
2017-02-19 21:21:46 -06:00
parent 8f9de993d0
commit 59a2cd8d80
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+30 -25
View File
@@ -1491,7 +1491,7 @@ public final class ChronicleMapBuilder<K, V> implements
return clone().createWithoutFile();
}
ChronicleMap<K, V> createWithFile(
private ChronicleMap<K, V> createWithFile(
File file, boolean recover, boolean overrideBuilderConfig) throws IOException {
if (overrideBuilderConfig && !recover)
throw new AssertionError("recover -> overrideBuilderConfig");
@@ -1564,7 +1564,7 @@ public final class ChronicleMapBuilder<K, V> implements
establishReplication(map);
map.setResourcesName();
map.registerCleaner();
// Ensure safe publication of a ChronicleMap
// Ensure safe publication of the ChronicleMap
OS.memory().storeFence();
map.addToOnExitHook();
}
@@ -1628,7 +1628,7 @@ public final class ChronicleMapBuilder<K, V> implements
/**
* @return ByteBuffer, in [position, limit) range the self bootstrapping header is read
*/
private ByteBuffer checkSumSelfBootstrappingHeader(
private static ByteBuffer readSelfBootstrappingHeader(
File file, RandomAccessFile raf, int headerSize, boolean recover) throws IOException {
if (raf.length() < headerSize + SELF_BOOTSTRAPPING_HEADER_OFFSET) {
throw throwRecoveryOrReturnIOException(file,
@@ -1655,17 +1655,17 @@ public final class ChronicleMapBuilder<K, V> implements
throw new IOException("file=" + file+ ": sizeWord is not ready: " + sizeWord);
}
}
long checkSum = headerChecksum(headerBuffer, headerSize);
long storedChecksum = headerBuffer.getLong(HEADER_OFFSET);
if (storedChecksum != checkSum) {
throw throwRecoveryOrReturnIOException(file,
"Self Bootstrapping Header checksum doesn't match the stored checksum: " +
storedChecksum + ", computed: " + checkSum, recover);
}
headerBuffer.position(SELF_BOOTSTRAPPING_HEADER_OFFSET);
return headerBuffer;
}
private static boolean checkSumSelfBootstrappingHeader(
ByteBuffer headerBuffer, int headerSize) {
long checkSum = headerChecksum(headerBuffer, headerSize);
long storedChecksum = headerBuffer.getLong(HEADER_OFFSET);
return storedChecksum == checkSum;
}
private VanillaChronicleMap<K, V, ?> createWithNewFile(
VanillaChronicleMap<K, V, ?> map, File file, RandomAccessFile raf,
ChronicleHashResources resources, ByteBuffer headerBuffer, int headerSize)
@@ -1683,15 +1683,22 @@ public final class ChronicleMapBuilder<K, V> implements
try {
int headerSize = waitUntilReady(raf, file, recover);
FileChannel fileChannel = raf.getChannel();
ByteBuffer headerBuffer;
if (overrideBuilderConfig) {
VanillaChronicleMap<K, V, ?> mapObjectForHeaderOverwrite = newMap();
headerBuffer = writeHeader(fileChannel, mapObjectForHeaderOverwrite);
headerSize = headerBuffer.remaining();
} else {
headerBuffer = checkSumSelfBootstrappingHeader(file, raf, headerSize, recover);
if (headerSize != headerBuffer.remaining())
throw new AssertionError();
ByteBuffer headerBuffer = readSelfBootstrappingHeader(file, raf, headerSize, recover);
if (headerSize != headerBuffer.remaining())
throw new AssertionError();
boolean headerCorrect = checkSumSelfBootstrappingHeader(headerBuffer, headerSize);
boolean headerWritten = false;
if (!headerCorrect) {
if (overrideBuilderConfig) {
VanillaChronicleMap<K, V, ?> mapObjectForHeaderOverwrite = newMap();
headerBuffer = writeHeader(fileChannel, mapObjectForHeaderOverwrite);
headerSize = headerBuffer.remaining();
headerWritten = true;
} else {
throw throwRecoveryOrReturnIOException(file,
"Self Bootstrapping Header checksum doesn't match the stored checksum",
recover);
}
}
Bytes<ByteBuffer> headerBytes = Bytes.wrapForRead(headerBuffer);
headerBytes.readPosition(headerBuffer.position());
@@ -1709,10 +1716,8 @@ public final class ChronicleMapBuilder<K, V> implements
if (!recover) {
map.createMappedStoreAndSegments(resources);
} else {
if (!overrideBuilderConfig)
if (!headerWritten)
writeNotComplete(fileChannel, headerBuffer, headerSize);
// if overrideBuilderConfig = true, readiness bit is already set
// in writeHeader() call
map.recover(resources);
commitChronicleMapReady(map, raf, headerBuffer, headerSize);
}
@@ -1726,7 +1731,7 @@ public final class ChronicleMapBuilder<K, V> implements
}
}
ChronicleMap<K, V> createWithoutFile() {
private ChronicleMap<K, V> createWithoutFile() {
replicated = replicationIdentifier != -1;
persisted = false;
@@ -1763,7 +1768,7 @@ public final class ChronicleMapBuilder<K, V> implements
}
}
void preMapConstruction() {
private void preMapConstruction() {
averageKeySize = preMapConstruction(
keyBuilder, averageKeySize, averageKey, sampleKey, "Key");
averageValueSize = preMapConstruction(
@@ -1866,7 +1871,7 @@ public final class ChronicleMapBuilder<K, V> implements
final double averageEntrySize;
final int worstAlignment;
public EntrySizeInfo(double averageEntrySize, int worstAlignment) {
EntrySizeInfo(double averageEntrySize, int worstAlignment) {
this.averageEntrySize = averageEntrySize;
this.worstAlignment = worstAlignment;
}