Skip to content

SpringImportJob: don't swallow DBError from doImport() #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
claude wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −0
Open

SpringImportJob: don't swallow DBError from doImport() #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions includes/Jobs/SpringImportJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use MediaWiki\User\UserIdentity;
use Throwable;
use WikiImporterFactory;
use Wikimedia\Rdbms\DBError;
use WikiOasis\Spring\ConfigNames;
use WikiOasis\Spring\Services\ImportSources;

Expand Down Expand Up @@ -73,6 +74,10 @@ public function run(): bool {
$this->importerFactory
->getWikiImporter( $status->getValue(), $performer )
->doImport();
} catch ( DBError $e ) {
// Let the job runner roll back and retry: swallowing this leaves the
// transaction poisoned and the import silently half-done.
throw $e;
} catch ( Throwable $e ) {
$logger->error( 'Import of {key} failed: {message}', [
'key' => $key,
Expand Down