MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/384790 )
Change subject: Shell\Command: Better walltime fallback ...................................................................... Shell\Command: Better walltime fallback Previously, it assumed that the only way times could be overridden is to reduce the limits - which isn't the case for video transcoding. Bug: T178314 Change-Id: I492a44f280a36ee666e9963788caac2bbc6bc6f3 (cherry picked from commit 945f8870d342b4ac4d7183911c67e14a03ced5ec) --- M includes/shell/Command.php 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/90/384790/1 diff --git a/includes/shell/Command.php b/includes/shell/Command.php index 4e0c0ec..b25dd2d 100644 --- a/includes/shell/Command.php +++ b/includes/shell/Command.php @@ -135,6 +135,11 @@ * @return $this */ public function limits( array $limits ) { + if ( !isset( $limits['walltime'] ) && isset( $limits['time'] ) ) { + // Emulate the behavior of old wfShellExec() where walltime fell back on time + // if the latter was overridden and the former wasn't + $limits['walltime'] = $limits['time']; + } $this->limits = $limits + $this->limits; return $this; @@ -227,8 +232,6 @@ if ( is_executable( '/bin/bash' ) ) { $time = intval( $this->limits['time'] ); $wallTime = intval( $this->limits['walltime'] ); - // for b/c, wall time falls back to time - $wallTime = min( $time, $wallTime ); $mem = intval( $this->limits['memory'] ); $filesize = intval( $this->limits['filesize'] ); -- To view, visit https://gerrit.wikimedia.org/r/384790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I492a44f280a36ee666e9963788caac2bbc6bc6f3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.31.0-wmf.3 Gerrit-Owner: MaxSem <maxsem.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits