jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405832 )
Change subject: rebaser: Fix sequencing of server operations
......................................................................
rebaser: Fix sequencing of server operations
pendingForDoc was not actually ever being populated.
Fixing this sequencing resulted in the artificial delay (typically 5s)
being applied to every event consecutively, which is not what we want
(it's *very* slow), so make the delays run in parallel with waiting
for the previous step (and its delay) to finish.
Change-Id: Ia7a53600d2b0626f81f306aeb72cecbbe00fe7ac
---
M rebaser/server.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Divec: Looks good to me, approved
jenkins-bot: Verified
diff --git a/rebaser/server.js b/rebaser/server.js
index 1199912..2bf6280 100644
--- a/rebaser/server.js
+++ b/rebaser/server.js
@@ -83,7 +83,6 @@
function* onSubmitChange( context, data ) {
var change, applied;
- yield wait( artificialDelay );
change = ve.dm.Change.static.deserialize( data.change, null, true );
applied = yield rebaseServer.applyChange( context.docName,
context.authorId, data.backtrack, change );
if ( !applied.isEmpty() ) {
@@ -148,13 +147,14 @@
}
function addStep( docName, generatorFunc ) {
- var pending = Promise.resolve( pendingForDoc.get( docName ) );
- pending = pending
+ var pending = Promise.resolve( pendingForDoc.get( docName ) ),
+ delayPromise = wait( artificialDelay );
+ pending = Promise.all( [ pending, delayPromise ] )
.then( function () {
return ve.spawn( generatorFunc );
} )
.catch( logError );
- pendingForDoc.set( pending );
+ pendingForDoc.set( docName, pending );
}
handlers = {
--
To view, visit https://gerrit.wikimedia.org/r/405832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7a53600d2b0626f81f306aeb72cecbbe00fe7ac
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Divec <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
