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

revert test code

Browse Source
This commit is contained in:
Ivan Rakov
2021-06-16 19:42:34 +03:00
parent 9a9b33b6cf
commit dca4167ffc
2 changed files with 2 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+2 -11
View File
@@ -1675,8 +1675,6 @@ public final class ChronicleMapBuilder<K, V> implements
replicated = replicationIdentifier != -1;
persisted = true;
boolean created = false;
// It's important to canonicalize the file, because CanonicalRandomAccessFiles.acquire()
// relies on java.io.File equality, which doesn't account symlinks itself.
final File canonicalFile = file.getCanonicalFile();
@@ -1684,8 +1682,7 @@ public final class ChronicleMapBuilder<K, V> implements
if (recover)
throw new FileNotFoundException("file " + canonicalFile + " should exist for recovery");
//noinspection ResultOfMethodCallIgnored
created = canonicalFile.createNewFile();
canonicalFile.createNewFile();
}
final RandomAccessFile raf = CanonicalRandomAccessFiles.acquire(canonicalFile);
final ChronicleHashResources resources = new PersistedChronicleHashResources(canonicalFile);
@@ -1694,12 +1691,6 @@ public final class ChronicleMapBuilder<K, V> implements
if (raf.length() > 0) {
result = openWithExistingFile(canonicalFile, raf, resources, recover, overrideBuilderConfig, corruptionListener);
} else {
if (created) {
System.out.println("Sleeping before lock acquisition for 10 seconds");
Jvm.pause(10000);
}
// Atomic* allows lambda modification
final AtomicReference<VanillaChronicleMap<K, V, ?>> map = new AtomicReference<>();
final AtomicReference<ByteBuffer> headerBuffer = new AtomicReference<>();
@@ -1726,7 +1717,7 @@ public final class ChronicleMapBuilder<K, V> implements
pauser.pause(10, TimeUnit.SECONDS);
}
catch (TimeoutException e) {
LOG.warn("Failed to write header: can't acquire exclusive file lock on empty file for 10 seconds", e);
LOG.warn("Failed to write header: can't acquire exclusive file lock on empty file [" + canonicalFile + "] for 10 seconds", e);
Jvm.rethrow(e);
}
src/main/java/net/openhft/chronicle/map/LockTestMain.java
-48
View File
@@ -1,48 +0,0 @@
package net.openhft.chronicle.map;/*
* Copyright 2016-2020 Chronicle Software
*
* https://chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import net.openhft.chronicle.core.Jvm;
import java.io.File;
import java.io.IOException;
public class LockTestMain {
public static void main(String[] args) throws IOException {
File f = new File("mapfile");
ChronicleMap<Integer, Integer> map = ChronicleMapBuilder
.of(Integer.class, Integer.class)
.entries(100)
.createPersistedTo(f);
for (int i = 0; i < 10; i++)
map.put(i, i);
for (int i = 0; i < 10; i++) {
if (!Integer.valueOf(i).equals(map.get(i)))
throw new IllegalStateException("FAIL");
}
System.out.println("Success");
System.out.println("Sleeping for 300 seconds");
Jvm.pause(300_000);
}
}