Allow double-closing of FSTranslog
the translog might be reused across engines which is currently a problem in the design such that we have to allow calls to `close` more than once. This moves the closed check for snapshot on the actual file to exit the loop. Relates to #10807
This commit is contained in:
parent
f87fb95830
commit
2c510f0689
|
@ -239,6 +239,11 @@ public class BufferingFsTranslogFile implements FsTranslogFile {
|
|||
return channelReference.file();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean closed() {
|
||||
return this.closed.get();
|
||||
}
|
||||
|
||||
class WrapperOutputStream extends OutputStream {
|
||||
|
||||
@Override
|
||||
|
|
|
@ -94,8 +94,6 @@ public class FsTranslog extends AbstractIndexShardComponent implements Translog
|
|||
|
||||
private final ApplySettings applySettings = new ApplySettings();
|
||||
|
||||
private final AtomicBoolean closed = new AtomicBoolean(false);
|
||||
|
||||
@Inject
|
||||
public FsTranslog(ShardId shardId, @IndexSettings Settings indexSettings, IndexSettingsService indexSettingsService,
|
||||
BigArrays bigArrays, ShardPath shardPath) throws IOException {
|
||||
|
@ -141,16 +139,14 @@ public class FsTranslog extends AbstractIndexShardComponent implements Translog
|
|||
|
||||
@Override
|
||||
public void close() throws IOException {
|
||||
if (closed.compareAndSet(false, true)) {
|
||||
if (indexSettingsService != null) {
|
||||
indexSettingsService.removeListener(applySettings);
|
||||
}
|
||||
rwl.writeLock().lock();
|
||||
try {
|
||||
IOUtils.close(this.trans, this.current);
|
||||
} finally {
|
||||
rwl.writeLock().unlock();
|
||||
}
|
||||
if (indexSettingsService != null) {
|
||||
indexSettingsService.removeListener(applySettings);
|
||||
}
|
||||
rwl.writeLock().lock();
|
||||
try {
|
||||
IOUtils.close(this.trans, this.current);
|
||||
} finally {
|
||||
rwl.writeLock().unlock();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -358,13 +354,15 @@ public class FsTranslog extends AbstractIndexShardComponent implements Translog
|
|||
@Override
|
||||
public FsChannelSnapshot snapshot() throws TranslogException {
|
||||
while (true) {
|
||||
if (closed.get()) {
|
||||
throw new TranslogException(shardId, "translog is already closed");
|
||||
}
|
||||
FsTranslogFile current = this.current;
|
||||
FsChannelSnapshot snapshot = current.snapshot();
|
||||
if (snapshot != null) {
|
||||
return snapshot;
|
||||
}
|
||||
if (current.closed() && this.current == current) {
|
||||
// check if we are closed and if we are still current - then this translog is closed and we can exit
|
||||
throw new TranslogException(shardId, "current translog is already closed");
|
||||
}
|
||||
Thread.yield();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,4 +82,6 @@ public interface FsTranslogFile extends Closeable {
|
|||
TranslogStream getStream();
|
||||
|
||||
public Path getPath();
|
||||
|
||||
public boolean closed();
|
||||
}
|
||||
|
|
|
@ -182,4 +182,10 @@ public class SimpleFsTranslogFile implements FsTranslogFile {
|
|||
public void updateBufferSize(int bufferSize) throws TranslogException {
|
||||
// nothing to do here...
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean closed() {
|
||||
return this.closed.get();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -340,7 +340,7 @@ public abstract class AbstractSimpleTranslogTests extends ElasticsearchTestCase
|
|||
Translog.Snapshot snapshot = translog.snapshot();
|
||||
fail("translog is closed");
|
||||
} catch (TranslogException ex) {
|
||||
assertEquals(ex.getMessage(), "translog is already closed");
|
||||
assertEquals(ex.getMessage(), "current translog is already closed");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue