X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fbackup.inc;h=bef9b3f3b3bdb54c11fa3bca18833424c1ed2957;hb=aa4f7f8ac1974bd46a9754ad32f4508d6063bd3e;hp=a8705da2e0514f709cd5fa2cb5f2d3d1f0050093;hpb=a26d5a49d755ff4b8039b11d1f26abb5d7bc7e8c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index a8705da2e0..bef9b3f3b3 100644
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -103,7 +103,7 @@ class BackupDumper {
 						$sinks[] = $sink;
 					}
 					if( !isset( $this->outputTypes[$val] ) ) {
-						die( "Unrecognized output sink type '$val'\n" );
+						wfDie( "Unrecognized output sink type '$val'\n" );
 					}
 					$type = $this->outputTypes[$val];
 					$sink = new $type( $param );
@@ -114,7 +114,7 @@ class BackupDumper {
 						$sink = new DumpOutput();
 					}
 					if( !isset( $this->filterTypes[$val] ) ) {
-						die( "Unrecognized filter type '$val'\n" );
+						wfDie( "Unrecognized filter type '$val'\n" );
 					}
 					$type = $this->filterTypes[$val];
 					$filter = new $type( $sink, $param );
@@ -154,11 +154,7 @@ class BackupDumper {
 		# relatively harmless.
 		ini_set( 'display_errors', false );
 
-		$this->startTime = wfTime();
-
-		$dbr =& wfGetDB( DB_SLAVE );
-		$this->maxCount = $dbr->selectField( 'page', 'MAX(page_id)', '', 'BackupDumper::dump' );
-		$this->startTime = wfTime();
+		$this->initProgress( $history );
 
 		$db =& $this->backupDb();
 		$exporter = new WikiExporter( $db, $history, MW_EXPORT_STREAM, $text );
@@ -184,11 +180,27 @@ class BackupDumper {
 
 		$this->report( true );
 	}
+	
+	/**
+	 * Initialise starting time and maximum revision count.
+	 * We'll make ETA calculations based an progress, assuming relatively
+	 * constant per-revision rate.
+	 * @param int $history MW_EXPORT_CURRENT or MW_EXPORT_FULL
+	 */
+	function initProgress( $history = MW_EXPORT_FULL ) {
+		$table = ($history == MW_EXPORT_CURRENT) ? 'page' : 'revision';
+		$field = ($history == MW_EXPORT_CURRENT) ? 'page_id' : 'rev_id';
+		
+		$dbr =& wfGetDB( DB_SLAVE );
+		$this->maxCount = $dbr->selectField( $table, "MAX($field)", '', 'BackupDumper::dump' );
+		$this->startTime = wfTime();
+	}
 
 	function &backupDb() {
 		global $wgDBadminuser, $wgDBadminpassword;
-		global $wgDBname;
-		$db =& new Database( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname );
+		global $wgDBname, $wgDebugDumpSql;
+		$flags = ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT; // god-damn hack
+		$db =& new Database( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );
 		$timeout = 3600 * 24;
 		$db->query( "SET net_read_timeout=$timeout" );
 		$db->query( "SET net_write_timeout=$timeout" );
@@ -204,15 +216,15 @@ class BackupDumper {
 
 	function reportPage() {
 		$this->pageCount++;
-		$this->report();
 	}
 
 	function revCount() {
 		$this->revCount++;
+		$this->report();
 	}
 
 	function report( $final = false ) {
-		if( $final xor ( $this->pageCount % $this->reportingInterval == 0 ) ) {
+		if( $final xor ( $this->revCount % $this->reportingInterval == 0 ) ) {
 			$this->showReport();
 		}
 	}
@@ -224,7 +236,7 @@ class BackupDumper {
 			if( $delta ) {
 				$rate = $this->pageCount / $delta;
 				$revrate = $this->revCount / $delta;
-				$portion = $this->pageCount / $this->maxCount;
+				$portion = $this->revCount / $this->maxCount;
 				$eta = $this->startTime + $delta / $portion;
 				$etats = wfTimestamp( TS_DB, intval( $eta ) );
 			} else {
@@ -233,7 +245,8 @@ class BackupDumper {
 				$etats = '-';
 			}
 			global $wgDBname;
-			$this->progress( "$now: $wgDBname $this->pageCount, ETA $etats ($rate pages/sec $revrate revs/sec)" );
+			$this->progress( sprintf( "%s: %s %d pages (%0.3f/sec), %d revs (%0.3f/sec), ETA %s [max %d]",
+				$now, $wgDBname, $this->pageCount, $rate, $this->revCount, $revrate, $etats, $this->maxCount ) );
 		}
 	}