~pbeaman/akiban-persistit/fix-1021734-nightly-deadlock

Viewing changes to src/main/java/com/persistit/CheckpointManager.java

Committer: build-akiban
Date: 2012-08-27 22:52:48 UTC
mfrom: (335.3.50 warmup-perf-test)
Revision ID: build@akiban.com-20120827225248-4i320bwuffmxtj18

merge pbeaman: This proposal is a re-work of the original buffer pool warm-up code.

https://code.launchpad.net/~pbeaman/akiban-persistit/buffer-pool-warmup-sorted/+merge/121320

files added:
src/test/java/com/persistit/TrackingFileChannel.java

src/test/java/com/persistit/stress/PreloadMixtureTxn1.java

files modified:
doc/Configuration.rst

src/main/java/com/persistit/BufferPool.java

src/main/java/com/persistit/CheckpointManager.java

src/main/java/com/persistit/Configuration.java

src/main/java/com/persistit/JournalManager.java

src/main/java/com/persistit/MediatedFileChannel.java

src/main/java/com/persistit/Persistit.java

src/main/java/com/persistit/logging/LogBase.java

src/test/java/com/persistit/IOFailureTest.java

src/test/java/com/persistit/StressRunner.java

src/test/java/com/persistit/WarmupTest.java

src/test/java/com/persistit/unit/PersistitUnitTestCase.java

src/test/java/com/persistit/unit/UnitTestProperties.java

Show diffs side-by-side

added added

removed removed

src/main/java/com/persistit/CheckpointManager.java

201

void pollCreateCheckpoint() throws PersistitException {

202

final long now = System.nanoTime();

203

if (_lastCheckpointNanos + _checkpointIntervalNanos < now) {

204

_persistit.recordBufferPoolInventory();

204

205

createCheckpoint();

205

206

}

206

207

}

252

253

_currentCheckpoint = new Checkpoint(txn.getStartTimestamp(), System.currentTimeMillis());

253

254

_outstandingCheckpoints.add(_currentCheckpoint);

254

255

_persistit.getLogBase().checkpointProposed.log(_currentCheckpoint);

255

return _currentCheckpoint;

256

} catch (final InterruptedException ie) {

257

throw new PersistitInterruptedException(ie);

258

} finally {

259

txn.end();

260

}

261

return _currentCheckpoint;

261

262

} finally {

262

263

_persistit.setSessionId(saveSessionId);

263

264

}

Older »