Merge "Clear the stat cache in addMissingMetadata() to avoid more POSTs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 28 Jul 2015 13:45:00 +0000 (13:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Jul 2015 13:45:00 +0000 (13:45 +0000)
1  2 
includes/filebackend/SwiftFileBackend.php

@@@ -670,10 -670,10 +670,10 @@@ class SwiftFileBackend extends FileBack
                $ps = Profiler::instance()->scopedProfileIn( __METHOD__ . "-{$this->name}" );
                wfDebugLog( 'SwiftBackend', __METHOD__ . ": $path was not stored with SHA-1 metadata." );
  
 +              $objHdrs['x-object-meta-sha1base36'] = false;
 +
                $auth = $this->getAuthentication();
                if ( !$auth ) {
 -                      $objHdrs['x-object-meta-sha1base36'] = false;
 -
                        return $objHdrs; // failed
                }
  
                                                'headers' => $this->authTokenHeaders( $auth ) + $objHdrs
                                        ) );
                                        if ( $rcode >= 200 && $rcode <= 299 ) {
+                                               $this->deleteFileCache( $path );
                                                return $objHdrs; // success
                                        }
                                }
                }
  
                wfDebugLog( 'SwiftBackend', __METHOD__ . ": unable to set SHA-1 metadata for $path" );
 -              $objHdrs['x-object-meta-sha1base36'] = false;
  
                return $objHdrs; // failed
        }