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 "EditPage: Don't throw exceptions for invalid content models"
[lhc/web/wiklou.git]
/
maintenance
/
backup.inc
diff --git
a/maintenance/backup.inc
b/maintenance/backup.inc
index
3271fd6
..
38daf64
100644
(file)
--- a/
maintenance/backup.inc
+++ b/
maintenance/backup.inc
@@
-41,6
+41,7
@@
class BackupDumper extends Maintenance {
public $revEndId = 0;
public $dumpUploads = false;
public $dumpUploadFileContents = false;
public $revEndId = 0;
public $dumpUploads = false;
public $dumpUploadFileContents = false;
+ public $orderRevs = false;
protected $reportingInterval = 100;
protected $pageCount = 0;
protected $reportingInterval = 100;
protected $pageCount = 0;
@@
-271,7
+272,7
@@
class BackupDumper extends Maintenance {
} elseif ( is_null( $this->pages ) ) {
# Page dumps: all or by page ID range
if ( $this->startId || $this->endId ) {
} elseif ( is_null( $this->pages ) ) {
# Page dumps: all or by page ID range
if ( $this->startId || $this->endId ) {
- $exporter->pagesByRange( $this->startId, $this->endId );
+ $exporter->pagesByRange( $this->startId, $this->endId
, $this->orderRevs
);
} elseif ( $this->revStartId || $this->revEndId ) {
$exporter->revsByRange( $this->revStartId, $this->revEndId );
} else {
} elseif ( $this->revStartId || $this->revEndId ) {
$exporter->revsByRange( $this->revStartId, $this->revEndId );
} else {
@@
-301,7
+302,7
@@
class BackupDumper extends Maintenance {
$dbr = $this->forcedDb;
if ( $this->forcedDb === null ) {
$dbr = $this->forcedDb;
if ( $this->forcedDb === null ) {
- $dbr = wfGetDB( DB_
SLAVE
);
+ $dbr = wfGetDB( DB_
REPLICA
);
}
$this->maxCount = $dbr->selectField( $table, "MAX($field)", '', __METHOD__ );
$this->startTime = microtime( true );
}
$this->maxCount = $dbr->selectField( $table, "MAX($field)", '', __METHOD__ );
$this->startTime = microtime( true );
@@
-321,7
+322,7
@@
class BackupDumper extends Maintenance {
}
$this->lb = wfGetLBFactory()->newMainLB();
}
$this->lb = wfGetLBFactory()->newMainLB();
- $db = $this->lb->getConnection( DB_
SLAVE
, 'dump' );
+ $db = $this->lb->getConnection( DB_
REPLICA
, 'dump' );
// Discourage the server from disconnecting us if it takes a long time
// to read out the big ol' batch query.
// Discourage the server from disconnecting us if it takes a long time
// to read out the big ol' batch query.