From 2cc10db0426d0181e9ffb4f73d050fb8068d4621 Mon Sep 17 00:00:00 2001 From: "This, that and the other" Date: Mon, 4 Jan 2016 00:30:24 +1100 Subject: [PATCH] Import: Try to stop revisions getting created with rev_page = 0 It seems that when two simultaneous imports of the same page are started, we get into the situation where $pageId is 0 (or at least something that is transformed to 0 when inserted into the DB). I can't reproduce this locally, so I can't tell you *why* this is happening. But what is important is to stop it from happening. Bug: T18674 Change-Id: I79406a1ef8e5db9a31f029438f8132ef590216fe --- includes/import/WikiRevision.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php index 6c238cf9f2..90b048a6bd 100644 --- a/includes/import/WikiRevision.php +++ b/includes/import/WikiRevision.php @@ -463,7 +463,7 @@ class WikiRevision { $page = WikiPage::factory( $this->title ); $page->loadPageData( 'fromdbmaster' ); if ( !$page->exists() ) { - # must create the page... + // must create the page... $pageId = $page->insertOn( $dbw ); $created = true; $oldcountable = null; @@ -486,7 +486,17 @@ class WikiRevision { } } + if ( !$pageId ) { + // This seems to happen if two clients simultaneously try to import the + // same page + wfDebug( __METHOD__ . ': got invalid $pageId when importing revision of [[' . + $this->title->getPrefixedText() . ']], timestamp ' . $this->timestamp . "\n" ); + return false; + } + // Select previous version to make size diffs correct + // @todo This assumes that multiple revisions of the same page are imported + // in order from oldest to newest. $prevId = $dbw->selectField( 'revision', 'rev_id', array( 'rev_page' => $pageId, -- 2.20.1