| 24 |
|
my $dataset = getOption (\@crabCfg, "datasetpath"); |
| 25 |
|
my $psetName = getOption (\@crabCfg, "pset"); |
| 26 |
|
my $jsonFileName = getOption (\@crabCfg, "lumi_mask"); |
| 27 |
< |
my $submissionLogName = getOption (\@crabCfg, "ui_working_dir"); |
| 28 |
< |
$submissionLogName .= "/log/crab.log"; |
| 27 |
> |
my $workingDir = getOption (\@crabCfg, "ui_working_dir"); |
| 28 |
|
|
| 29 |
|
print "Ntuple format (BEAN): "; |
| 30 |
|
my $format = <STDIN>; |
| 38 |
|
|
| 39 |
|
my $status = "created"; |
| 40 |
|
$status = "submitted" if $arg =~ m/-submit/; |
| 41 |
< |
my $results = dbInsert ($dataset, $ENV{"USER"}, $format, "", 0, 0, $status, $comment, $psetName, $crabCfgName, $jsonFileName, $submissionLogName); |
| 41 |
> |
my $results = dbInsert ($dataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $format, "", 0, 0, $status, $comment, $psetName, $crabCfgName, $jsonFileName, $workingDir); |
| 42 |
|
} |
| 43 |
|
elsif ($arg =~ m/-submit/) |
| 44 |
|
{ |
| 51 |
|
close (ID_FILE); |
| 52 |
|
$id =~ s/(.*)\n/$1/; |
| 53 |
|
} |
| 55 |
– |
my $submissionLogName = $workingDir . "/log/crab.log"; |
| 54 |
|
|
| 55 |
|
system ("crab $arg"); |
| 56 |
|
|
| 57 |
< |
my $results = dbUpdate ($id, "submitted", $submissionLogName, $ENV{"USER"}) if $id > -1; |
| 57 |
> |
my $results = dbUpdate ($id, "submitted", "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $id > -1; |
| 58 |
|
} |
| 59 |
|
elsif ($arg =~ m/-report/) |
| 60 |
|
{ |
| 71 |
|
|
| 72 |
|
system ("crab $arg"); |
| 73 |
|
|
| 74 |
< |
my $results = dbReport ($id, "complete", $lumiSummaryName, $ENV{"USER"}) if $id > -1; |
| 74 |
> |
my $results = dbReport ($id, "complete", $lumiSummaryName, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $id > -1; |
| 75 |
|
} |
| 76 |
|
elsif ($arg =~ m/-status/) |
| 77 |
|
{ |
| 87 |
|
my $currentStatusName = "$workingDir/log/.currentStatus"; |
| 88 |
|
unlink ($currentStatusName) if -e $currentStatusName; |
| 89 |
|
system ("crab $arg | tee $currentStatusName"); |
| 90 |
< |
my $results = dbStatus ($id, $currentStatusName, $ENV{"USER"}) if $id > -1; |
| 90 |
> |
my $results = dbStatus ($id, $currentStatusName, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $id > -1; |
| 91 |
|
unlink ($currentStatusName); |
| 92 |
|
} |
| 93 |
|
else |
| 149 |
|
dbInsert |
| 150 |
|
{ |
| 151 |
|
my $dataset = shift; |
| 152 |
< |
my $user = shift; |
| 152 |
> |
my $userAndHost = shift; |
| 153 |
|
my $format = shift; |
| 154 |
|
my $location = shift; |
| 155 |
|
my $nFiles = shift; |
| 159 |
|
my $psetName = shift; |
| 160 |
|
my $crabCfgName = shift; |
| 161 |
|
my $jsonFileName = shift; |
| 162 |
< |
my $submissionLogName = shift; |
| 162 |
> |
my $workingDir = shift; |
| 163 |
> |
|
| 164 |
> |
my $user = $userAndHost; |
| 165 |
> |
$user =~ s/@.*$//; |
| 166 |
|
|
| 167 |
|
open (PY_CONFIG, "<$psetName"); |
| 168 |
|
my @pset = <PY_CONFIG>; |
| 176 |
|
my @jsonFile = <JSON_FILE>; |
| 177 |
|
close (JSON_FILE); |
| 178 |
|
my $jsonFile = join ("", @jsonFile); |
| 178 |
– |
open (SUBMISSION_LOG, "<$submissionLogName"); |
| 179 |
– |
my @submissionLog = <SUBMISSION_LOG>; |
| 180 |
– |
close (SUBMISSION_LOG); |
| 181 |
– |
my $submissionLog = join ("", @submissionLog); |
| 179 |
|
|
| 180 |
|
$dataset = addSlashes ($dataset); |
| 181 |
|
$user = addSlashes ($user); |
| 183 |
|
$pset = addSlashes ($pset); |
| 184 |
|
$crabCfg = addSlashes ($crabCfg); |
| 185 |
|
$jsonFile = addSlashes ($jsonFile); |
| 189 |
– |
$submissionLog = addSlashes ($submissionLog); |
| 186 |
|
$location = addSlashes ($location); |
| 187 |
|
$status = addSlashes ($status); |
| 188 |
|
$comment = addSlashes ($comment); |
| 195 |
|
my $id = 1; |
| 196 |
|
$id = $row[0] + 1 if $results->numrows (); |
| 197 |
|
|
| 202 |
– |
my $workingDir = $submissionLogName; |
| 203 |
– |
$workingDir =~ s/(.*)\/log\/crab\.log/$1/; |
| 198 |
|
open (ID_FILE, ">$workingDir/log/.osuID"); |
| 199 |
|
print ID_FILE "$id\n"; |
| 200 |
|
close (ID_FILE); |
| 201 |
|
|
| 202 |
< |
$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, submissionLog) values ($id, '$dataset', now(), now(), '$user', '$user', '$format', '$location', $nFiles, $sizeInGB, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$submissionLog')"; |
| 202 |
> |
$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$location', $nFiles, $sizeInGB, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile')"; |
| 203 |
|
$results = $db->query ($query); |
| 204 |
|
|
| 205 |
|
return $results; |
| 210 |
|
{ |
| 211 |
|
my $id = shift; |
| 212 |
|
my $status = shift; |
| 219 |
– |
my $submissionLogName = shift; |
| 213 |
|
my $user = shift; |
| 214 |
|
|
| 222 |
– |
open (SUBMISSION_LOG, "<$submissionLogName"); |
| 223 |
– |
my @submissionLog = <SUBMISSION_LOG>; |
| 224 |
– |
close (SUBMISSION_LOG); |
| 225 |
– |
my $submissionLog = join ("", @submissionLog); |
| 226 |
– |
|
| 227 |
– |
$submissionLog = addSlashes ($submissionLog); |
| 215 |
|
$status = addSlashes ($status); |
| 216 |
|
$user = addSlashes ($user); |
| 217 |
|
|
| 218 |
|
my $results; |
| 219 |
< |
my $query = "update ntuple set lastUpdateTime=now(), lastUpdateUser='$user', status='$status', submissionLog='$submissionLog' where id=$id"; |
| 219 |
> |
my $query = "update ntuple set lastUpdateTime=now(), lastUpdateUser='$user', status='$status' where id=$id"; |
| 220 |
|
$db->selectdb ("ntuple"); |
| 221 |
|
$results = $db->query ($query); |
| 222 |
|
|
