| Index: trunk/phase3/maintenance/storage/trackBlobs.php |
| — | — | @@ -12,6 +12,7 @@ |
| 13 | 13 | } |
| 14 | 14 | $tracker = new TrackBlobs( $args ); |
| 15 | 15 | $tracker->run(); |
| | 16 | +echo "All done.\n"; |
| 16 | 17 | |
| 17 | 18 | class TrackBlobs { |
| 18 | 19 | var $clusters, $textClause; |
| — | — | @@ -263,6 +264,10 @@ |
| 264 | 265 | if ( is_null( $table ) ) { |
| 265 | 266 | $table = 'blobs'; |
| 266 | 267 | } |
| | 268 | + if ( !$extDB->tableExists( $table ) ) { |
| | 269 | + echo "No blobs table on cluster $cluster\n"; |
| | 270 | + continue; |
| | 271 | + } |
| 267 | 272 | $startId = 0; |
| 268 | 273 | $batchesDone = 0; |
| 269 | 274 | $actualBlobs = gmp_init( 0 ); |
| Index: trunk/phase3/maintenance/gearman/gearman.inc |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | socket_close( $this->conn ); |
| 14 | 14 | |
| 15 | 15 | # Close some more sockets |
| 16 | | - wfGetLBFactory()->shutdown(); |
| | 16 | + LBFactory::destroyInstance(); |
| 17 | 17 | global $wgMemc; |
| 18 | 18 | $wgMemc->disconnect_all(); |
| 19 | 19 | |
| Index: trunk/phase3/maintenance/namespaceDupes.php |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | --prefix=<text> : Do an explicit check for the given title prefix |
| 39 | 39 | in place of the standard namespace list. |
| 40 | 40 | --verbose : Display output for checked namespaces without conflicts |
| 41 | | - |
| | 41 | + --wiki=<wiki> : enter the wiki database to edit |
| 42 | 42 | ENDS; |
| 43 | 43 | die; |
| 44 | 44 | } |
| Index: trunk/phase3/includes/ForkController.php |
| — | — | @@ -80,9 +80,11 @@ |
| 81 | 81 | } elseif ( pcntl_wifexited( $status ) ) { |
| 82 | 82 | // Restart on non-zero exit status |
| 83 | 83 | $exitStatus = pcntl_wexitstatus( $status ); |
| 84 | | - if ( $exitStatus > 0 ) { |
| | 84 | + if ( $exitStatus != 0 ) { |
| 85 | 85 | echo "Worker exited with status $exitStatus, restarting\n"; |
| 86 | 86 | $this->procsToStart++; |
| | 87 | + } else { |
| | 88 | + echo "Worker exited normally\n"; |
| 87 | 89 | } |
| 88 | 90 | } |
| 89 | 91 | } |