github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't fire write fence until observes are steady.

Browse Source
This commit is contained in:
David Glasser
2013-10-19 00:24:12 -07:00
parent f797a49beb
commit 9cc8ca6c2b
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/mongo-livedata/oplog.js
View File

@@ -94,7 +94,17 @@ MongoConnection.prototype._observeChangesWithOplog = function (
f.get();
});
}
beSteady();
};
var writesToCommitWhenWeReachSteady = [];
var beSteady = function () {
phase = PHASE.STEADY;
var writes = writesToCommitWhenWeReachSteady;
writesToCommitWhenWeReachSteady = [];
_.each(writes, function (w) {
w.committed();
});
};
var oplogEntryHandlers = {};
@@ -163,17 +173,20 @@ MongoConnection.prototype._observeChangesWithOplog = function (
// XXX ordering w.r.t. everything else?
var listenersHandle = listenAll(
cursorDescription, function (notification, complete) {
// If we're not in a write fence, we don't have to do anything. That's
// because
// If we're not in a write fence, we don't have to do anything.
var fence = DDPServer._CurrentWriteFence.get();
if (!fence) {
complete();
return;
}
var write = fence.beginWrite();
// XXX this also has to wait for steady!!!
// This write cannot complete until we've caught up to "this point" in the
// oplog, and then made it back to the steady state.
self._oplogHandle.callWhenProcessedLatest(function () {
write.committed();
if (phase === PHASE.STEADY)
write.committed();
else
writesToCommitWhenWeReachSteady.push(write);
});
complete();
}
@@ -192,7 +205,7 @@ MongoConnection.prototype._observeChangesWithOplog = function (
throw Error("Phase unexpectedly " + phase);
if (curiousity.isEmpty()) {
phase = PHASE.STEADY;
beSteady();
} else {
phase = PHASE.FETCHING;
Meteor.defer(beCurious);