Fix timestamp check in ApiStashEdit::checkCache

* The wrong time method was used, and it also was not set.
* Bumped the threshold a bit while at it, which was basically
  0-5 minutes before.

Bug: T133332
Change-Id: Ide3e66f551aa6e50410c562e5c917141d59b7f64

diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index cc8e390..f5d57c1 100644 (file)
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -40,6 +40,8 @@ class ApiStashEdit extends ApiBase {
        const ERROR_CACHE = 'error_cache';
        const ERROR_UNCACHEABLE = 'uncacheable';
 
+       const PRESUME_FRESH_TTL_SEC = 5;
+
        public function execute() {
                $user = $this->getUser();
                $params = $this->extractRequestParams();
@@ -281,10 +283,10 @@ class ApiStashEdit extends ApiBase {
                        return false;
                }
 
-               $time = wfTimestamp( TS_UNIX, $editInfo->output->getTimestamp() );
-               if ( ( time() - $time ) <= 3 ) {
+               $age = time() - wfTimestamp( TS_UNIX, $editInfo->output->getCacheTime() );
+               if ( $age <= self::PRESUME_FRESH_TTL_SEC ) {
                        $stats->increment( 'editstash.cache_hits.presumed_fresh' );
-                       $logger->debug( "Timestamp-based cache hit for key '$key'." );
+                       $logger->debug( "Timestamp-based cache hit for key '$key' (age: $age sec)." );
                        return $editInfo; // assume nothing changed
                }
 
@@ -313,7 +315,7 @@ class ApiStashEdit extends ApiBase {
 
                        if ( $changed || $res->numRows() != $templateUses ) {
                                $stats->increment( 'editstash.cache_misses.proven_stale' );
-                               $logger->info( "Stale cache for key '$key'; template changed." );
+                               $logger->info( "Stale cache for key '$key'; template changed. (age: $age sec)" );
                                return false;
                        }
                }
@@ -337,13 +339,13 @@ class ApiStashEdit extends ApiBase {
 
                        if ( $changed || $res->numRows() != count( $files ) ) {
                                $stats->increment( 'editstash.cache_misses.proven_stale' );
-                               $logger->info( "Stale cache for key '$key'; file changed." );
+                               $logger->info( "Stale cache for key '$key'; file changed. (age: $age sec)" );
                                return false;
                        }
                }
 
                $stats->increment( 'editstash.cache_hits.proven_fresh' );
-               $logger->debug( "Cache hit for key '$key'." );
+               $logger->debug( "Verified cache hit for key '$key' (age: $age sec)." );
 
                return $editInfo;
        }

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 06785b7..040a6f3 100644 (file)
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -2115,7 +2115,13 @@ class WikiPage implements Page, IDBAccessObject {
                        : '';
                $edit->pst = $edit->pstContent ? $edit->pstContent->serialize( $serialFormat ) : '';
 
+               if ( $edit->output ) {
+                       $edit->output->setCacheTime( wfTimestampNow() );
+               }
+
+               // Process cache the result
                $this->mPreparedEdit = $edit;
+
                return $edit;
        }
 

diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index 731d4a0..5876e0b 100644 (file)
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -204,6 +204,7 @@ class ParserCache {
                }
 
                $casToken = null;
+               /** @var ParserOutput $value */
                $value = $this->mMemc->get( $parserOutputKey, $casToken, BagOStuff::READ_VERIFIED );
                if ( !$value ) {
                        wfDebug( "ParserOutput cache miss.\n" );

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 40c67dd..6c7ad4e 100644 (file)
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -381,6 +381,9 @@ class ParserOutput extends CacheTime {
                return $this->mTOCHTML;
        }
 
+       /**
+        * @return string|null TS_MW timestamp of the revision content
+        */
        public function getTimestamp() {
                return $this->mTimestamp;
        }