From: ASchulz <aschulz@wikimedia.org>
Date: Wed, 27 Mar 2013 21:26:47 +0000 (-0700)
Subject: [JobQueue] Ignore job release timestamps for de-duplication.
X-Git-Tag: 1.31.0-rc.0~20199^2
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=78695bcebf638da61f180e22bdd2690f0a4bec48;p=lhc%2Fweb%2Fwiklou.git

[JobQueue] Ignore job release timestamps for de-duplication.

Change-Id: I5d2a0b325eee7230450d7623e1dbcef1f8e681b9
---

diff --git a/includes/job/Job.php b/includes/job/Job.php
index d8f55c3b81..e12bc95058 100644
--- a/includes/job/Job.php
+++ b/includes/job/Job.php
@@ -212,10 +212,12 @@ abstract class Job {
 			'title'     => $this->getTitle()->getDBkey(),
 			'params'    => $this->getParams()
 		);
-		// Identical jobs with different "root" jobs should count as duplicates
 		if ( is_array( $info['params'] ) ) {
+			// Identical jobs with different "root" jobs should count as duplicates
 			unset( $info['params']['rootJobSignature'] );
 			unset( $info['params']['rootJobTimestamp'] );
+			// Likewise for jobs with different delay times
+			unset( $info['params']['jobReleaseTimestamp'] );
 		}
 		return $info;
 	}