coren has submitted this change and it was merged.
Change subject: Fix warnings.
......................................................................
Fix warnings.
Change-Id: I8f82e1161c9a84e5935a934d8dc3d4e6b64963f4
---
M jobutils/bin/jsub
1 file changed, 17 insertions(+), 16 deletions(-)
Approvals:
coren: Verified; Looks good to me, approved
diff --git a/jobutils/bin/jsub b/jobutils/bin/jsub
index f1e62c3..78f34fd 100755
--- a/jobutils/bin/jsub
+++ b/jobutils/bin/jsub
@@ -6,20 +6,6 @@
use IPC::Run qw(harness run);
use String::ShellQuote;
-sub memparse_kb {
- # parses an XXK, XXm, XXg to the # of kilobytes
- $arg = $_[0];
- if ($arg =~ m/^([1-9][0-9]*)([mgk])$/i) {
- $amount = $1;
- $unit = $2;
- if($unit =~ m/[mg]/i) {$amount *= 1024};
- if($unit =~ m/[g]/i) {$amount *= 1024};
- } else {
- die "$script: memory value must be an integer followed by 'k', 'm' or 'g':
$_[0]\n";
- }
- return $amount;
-}
-
my %qsubargs = (
'-a' => 1, '-b' => 1, '-cwd' => 0, '-e' => 1, '-hard' => 0, '-i' => 1,
'-j' => 1,
'-l' => 1, '-now' => 1, '-N' => 1, '-o' => 1, '-p' => 1, '-q' => 1,
'-soft' => 0,
@@ -36,6 +22,21 @@
my $script = $0;
my $queue = 'task';
$script = $1 if $script =~ m{/([^/]+)$};
+
+sub memparse_kb {
+ # parses an XXK, XXm, XXg to the # of kilobytes
+ my $arg = $_[0];
+ if ($arg !~ m/^([1-9][0-9]*)([mgk])$/i) {
+ die "$script: memory value must be an integer followed by 'k', 'm' or 'g':
$_[0]\n";
+ }
+
+ my $amount = $1;
+ my $unit = $2;
+ if($unit =~ m/[mg]/i) {$amount *= 1024};
+ if($unit =~ m/[g]/i) {$amount *= 1024};
+
+ return $amount;
+}
$continuous = $once = 1 if ($script eq 'jstart');
$once = 1 if $script eq 'qcronsub';
@@ -135,9 +136,9 @@
if($opt eq '-l') {
$memory = memparse_kb($1) if $optval =~ s/h_vmem=([0-9]+[mMgGkK]),?//;
if ($optval =~ s/virtual_free=([0-9]+[mMgGkK]),?//) {
- $vfmem = memparse_kb($1);
+ my $vfmem = memparse_kb($1);
if ($vfmem > $memory) {
- $new_mem = $vfmem * 1.1;
+ my $new_mem = $vfmem * 1.1;
print "WARNING: virtual_free=${vfmem}k is larger than
h_vmem=${memory}k. Setting h_vmem=${new_mem}k\n";
$memory = $new_mem;
}
--
To view, visit https://gerrit.wikimedia.org/r/67643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f82e1161c9a84e5935a934d8dc3d4e6b64963f4
Gerrit-PatchSet: 2
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
