honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] Enable MockFS on InternalEngineTests and TranslogTests

This commit is contained in:
Simon Willnauer 2015-05-18 16:58:19 +02:00
parent 7d1eb6e900
commit bba1528fa4
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
View File

@ -38,7 +38,6 @@ import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
@ -82,7 +81,6 @@ import org.elasticsearch.index.translog.Translog;
import org.elasticsearch.index.translog.TranslogConfig; import org.elasticsearch.index.translog.TranslogConfig;
import org.elasticsearch.test.DummyShardLock; import org.elasticsearch.test.DummyShardLock;
import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.test.ElasticsearchTestCase;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import org.hamcrest.MatcherAssert; import org.hamcrest.MatcherAssert;
import org.junit.After; import org.junit.After;
@ -102,8 +100,6 @@ import static org.elasticsearch.index.engine.Engine.Operation.Origin.PRIMARY;
import static org.elasticsearch.index.engine.Engine.Operation.Origin.REPLICA; import static org.elasticsearch.index.engine.Engine.Operation.Origin.REPLICA;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
// TODO: this guy isn't ready for mock filesystems yet
@SuppressFileSystems("*")
public class InternalEngineTests extends ElasticsearchTestCase { public class InternalEngineTests extends ElasticsearchTestCase {
protected final ShardId shardId = new ShardId(new Index("index"), 1); protected final ShardId shardId = new ShardId(new Index("index"), 1);
@ -1555,9 +1551,8 @@ public class InternalEngineTests extends ElasticsearchTestCase {
// fake a new translog, causing the engine to point to a missing one. // fake a new translog, causing the engine to point to a missing one.
Translog translog = createTranslog(); Translog translog = createTranslog();
long id = translog.currentFileGeneration(); long id = translog.currentFileGeneration();
IOUtils.rm(translog.location().resolve(Translog.getFilename(id)));
// we have to re-open the translog because o.w. it will complain about commit information going backwards, which is OK as we did a fake markComitted
translog.close(); translog.close();
IOUtils.rm(translog.location().resolve(Translog.getFilename(id)));
try { try {
engine = createEngine(store, primaryTranslogDir); engine = createEngine(store, primaryTranslogDir);
fail("engine shouldn't start without a valid translog id"); fail("engine shouldn't start without a valid translog id");
@ -1570,7 +1565,6 @@ public class InternalEngineTests extends ElasticsearchTestCase {
engine = createEngine(indexSettingsService, store, primaryTranslogDir, createMergeScheduler(indexSettingsService)); engine = createEngine(indexSettingsService, store, primaryTranslogDir, createMergeScheduler(indexSettingsService));
} }
@TestLogging("index.translog:TRACE")
public void testTranslogReplayWithFailure() throws IOException { public void testTranslogReplayWithFailure() throws IOException {
boolean canHaveDuplicates = true; boolean canHaveDuplicates = true;
boolean autoGeneratedId = true; boolean autoGeneratedId = true;

5
src/test/java/org/elasticsearch/index/translog/TranslogTests.java
View File

@ -25,7 +25,6 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.store.ByteArrayDataOutput;
import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.TestUtil;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -64,7 +63,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Matcher;
import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayList;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
@ -72,7 +70,6 @@ import static org.hamcrest.Matchers.*;
/** /**
* *
*/ */
@LuceneTestCase.SuppressFileSystems("ExtrasFS")
public class TranslogTests extends ElasticsearchTestCase { public class TranslogTests extends ElasticsearchTestCase {
protected final ShardId shardId = new ShardId(new Index("index"), 1); protected final ShardId shardId = new ShardId(new Index("index"), 1);
@ -117,7 +114,7 @@ public class TranslogTests extends ElasticsearchTestCase {
protected Translog create(Path path) throws IOException { protected Translog create(Path path) throws IOException {
Settings build = ImmutableSettings.settingsBuilder() Settings build = ImmutableSettings.settingsBuilder()
.put("index.translog.fs.type", TranslogWriter.Type.SIMPLE.name()) .put(TranslogConfig.INDEX_TRANSLOG_FS_TYPE, TranslogWriter.Type.SIMPLE.name())
.build(); .build();
TranslogConfig translogConfig = new TranslogConfig(shardId, path, build, Translog.Durabilty.REQUEST, BigArrays.NON_RECYCLING_INSTANCE, null); TranslogConfig translogConfig = new TranslogConfig(shardId, path, build, Translog.Durabilty.REQUEST, BigArrays.NON_RECYCLING_INSTANCE, null);
return new Translog(translogConfig); return new Translog(translogConfig);