dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Drop archive.ar_text and ar_flags"
[lhc/web/wiklou.git]
/
maintenance
/
storage
/
recompressTracked.php
diff --git
a/maintenance/storage/recompressTracked.php
b/maintenance/storage/recompressTracked.php
index
c5dd53b
..
49b8e0a
100644
(file)
--- a/
maintenance/storage/recompressTracked.php
+++ b/
maintenance/storage/recompressTracked.php
@@
-114,8
+114,8
@@
class RecompressTracked {
$GLOBALS['wgDebugLogPrefix'] = "RCT {$this->replicaId}: ";
}
$this->pageBlobClass = function_exists( 'xdiff_string_bdiff' ) ?
$GLOBALS['wgDebugLogPrefix'] = "RCT {$this->replicaId}: ";
}
$this->pageBlobClass = function_exists( 'xdiff_string_bdiff' ) ?
-
'DiffHistoryBlob' : 'ConcatenatedGzipHistoryBlob'
;
- $this->orphanBlobClass =
'ConcatenatedGzipHistoryBlob'
;
+
DiffHistoryBlob::class : ConcatenatedGzipHistoryBlob::class
;
+ $this->orphanBlobClass =
ConcatenatedGzipHistoryBlob::class
;
}
function debug( $msg ) {
}
function debug( $msg ) {
@@
-236,9
+236,9
@@
class RecompressTracked {
[ 'file', 'php://stdout', 'w' ],
[ 'file', 'php://stderr', 'w' ]
];
[ 'file', 'php://stdout', 'w' ],
[ 'file', 'php://stderr', 'w' ]
];
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$proc = proc_open( "$cmd --replica-id $i", $spec, $pipes );
$proc = proc_open( "$cmd --replica-id $i", $spec, $pipes );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( !$proc ) {
$this->critical( "Error opening replica DB process: $cmd" );
exit( 1 );
if ( !$proc ) {
$this->critical( "Error opening replica DB process: $cmd" );
exit( 1 );
@@
-643,7
+643,8
@@
class RecompressTracked {
* @return Database
*/
function getExtDB( $cluster ) {
* @return Database
*/
function getExtDB( $cluster ) {
- $lb = wfGetLBFactory()->getExternalLB( $cluster );
+ $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+ $lb = $lbFactory->getExternalLB( $cluster );
return $lb->getConnection( DB_MASTER );
}
return $lb->getConnection( DB_MASTER );
}