$src = FileBackendGroup::singleton()->get( $this->getOption( 'src' ) );
$dst = FileBackendGroup::singleton()->get( $this->getOption( 'dst' ) );
- $posFile = $this->getOption( 'posdir' )
- ? $this->getOption( 'posdir' ) . '/' . wfWikiID()
- : false;
+ $posDir = $this->getOption( 'posdir' );
+ $posFile = $posDir ? $posDir . '/' . wfWikiID() : false;
$start = $this->getOption( 'start', 0 );
- if ( !$start && $posFile ) {
+ if ( !$start && $posFile && is_dir( $posDir ) ) {
$start = is_file( $posFile )
? (int)trim( file_get_contents( $posFile ) )
: 0;
// Update the sync position file
if ( $startFromPosFile && $lastOKPos >= $start ) { // successfully advanced
- file_put_contents( $posFile, $lastOKPos, LOCK_EX );
- $this->output( "Updated journal position file.\n" );
+ if ( file_put_contents( $posFile, $lastOKPos, LOCK_EX ) !== false ) {
+ $this->output( "Updated journal position file.\n" );
+ } else {
+ $this->output( "Could not update journal position file.\n" );
+ }
}
if ( $lastOKPos === false ) {
if ( $status->isOK() ) {
$lastOKPos = max( $lastOKPos, $lastPosInBatch );
} else {
- $this->output( print_r( $status->getErrorsArray(), true ) );
+ $this->error( print_r( $status->getErrorsArray(), true ) );
break; // no gaps; everything up to $lastPos must be OK
}
}
$fsFiles[] = $fsFile; // keep TempFSFile objects alive as needed
// Note: prepare() is usually fast for key/value backends
- $status->merge( $dst->prepare( array( 'dir' => dirname( $dPath ) ) ) );
+ $status->merge( $dst->prepare( array(
+ 'dir' => dirname( $dPath ), 'bypassReadOnly' => 1 ) ) );
if ( !$status->isOK() ) {
return $status;
}
}
}
- $status->merge( $dst->doOperations( $ops,
- array( 'nonLocking' => 1, 'nonJournaled' => 1 ) ) );
+ $t_start = microtime( true );
+ $status->merge( $dst->doQuickOperations( $ops, array( 'bypassReadOnly' => 1 ) ) );
+ $ellapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 );
if ( $status->isOK() && $this->getOption( 'verbose' ) ) {
- $this->output( "Synchronized these file(s):\n" . implode( "\n", $dPaths ) . "\n" );
+ $this->output( "Synchronized these file(s) [{$ellapsed_ms}ms]:\n" .
+ implode( "\n", $dPaths ) . "\n" );
}
return $status;