ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/OSUT3Analysis/DBTools/scripts/osudb
(Generate patch)

Comparing UserCode/OSUT3Analysis/DBTools/scripts/osudb (file contents):
Revision 1.15 by ahart, Fri Nov 30 18:20:59 2012 UTC vs.
Revision 1.26 by ahart, Thu May 23 20:39:16 2013 UTC

# Line 4 | Line 4 | use strict;
4   use Mysql;
5   use Getopt::Long;
6   use File::Copy;
7 + use Term::ANSIColor;
8  
9   sub getDataset;
10   sub dbUpdate;
# Line 15 | Line 16 | sub uploadRelease;
16   sub downloadRelease;
17   sub datasetExists;
18   sub uploadConfig;
19 + sub locationExists;
20 + sub getLocation;
21  
22   our $db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User") or die "Failed to connect to Tier 3, stopped";
23  
24   my %opt;
25   Getopt::Long::Configure ("bundling");
26 < GetOptions (\%opt, "comment|c=s", "format|f=s", "pyConfig|p=s", "crabCfg|b=s", "jsonFile|j=s", "lumiSummary|s=s", "location|l=s", "fileList|t=s", "release|r=s", "other|o", "recipe|e=s", "help|h");
26 > GetOptions (\%opt, "comment|c=s", "format|f=s", "pyConfig|p=s", "crabCfg|b=s", "jsonFile|j=s", "lumiSummary|s=s", "location|l=s", "name|n=s", "fileList|t=s", "release|r=s", "other|o", "recipe|e=s", "globalTag|g=s", "configName|i=s", "xSection|x=s", "higherOrderXSec|y=s", "help|h");
27   my $argc = @ARGV;
28  
29   printHelp ($ARGV[0]) if $opt{"help"};
# Line 80 | Line 83 | else
83      $status = "" if $ARGV[0] eq "update";
84      $status = "deprecated" if $ARGV[0] eq "deprecate";
85      $opt{"format"} = "BEAN" if $ARGV[0] eq "create" && !$opt{"format"};
86 <    dbUpdate ($id, $fullDataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"format"}, $opt{"location"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}) if !$opt{"other"};
87 <    dbUpdateOther ($id, $opt{"comment"}, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $opt{"other"};
86 >    if ($opt{"location"} && locationExists ($id, $opt{"location"}))
87 >      {
88 >        print "This location is already registered in the database!\n";
89 >        exit;
90 >      }
91 >    dbUpdate ($id, $fullDataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"format"}, $opt{"location"}, $opt{"name"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}, $opt{"globalTag"}, $opt{"configName"}, $opt{"xSection"}, $opt{"higherOrderXSec"}) if $ARGV[0] ne "deleteEntry" && !$opt{"other"};
92 >    dbUpdateOther ($id, $opt{"comment"}, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $ARGV[0] ne "deleteEntry" && $opt{"other"};
93      dbDelete ($id) if $ARGV[0] eq "deleteEntry" && !$opt{"other"};
94      dbDeleteOther ($id) if $ARGV[0] eq "deleteEntry" && $opt{"other"};
95    }
# Line 109 | Line 117 | getDataset
117    my $queryDataset = $dataset;
118    $queryDataset =~ s/\*/%/g;
119    $queryDataset =~ s/(.*)/%$1%/g;
120 <  my $query = "select id,dataset,user,creationTime from ntuple where dataset like '$queryDataset' order by creationTime";
120 >  my $query = "select id,dataset,user,creationTime,status from ntuple where dataset like '$queryDataset' order by creationTime";
121    $db->selectdb ("ntuple");
122    $results = $db->query ($query);
123    if ($results->numrows () == 1)
# Line 142 | Line 150 | getDataset
150    for (my $i = 1; $i <= $results->numrows (); $i++)
151      {
152        my @row = $results->fetchrow ();
153 +      $row[3] =~ s/([^ ]*) [^ ]*/$1/g;
154        $id{"$i"} = $row[0];
155        $fullDataset{"$i"} = $row[1];
156        printf "(%2d) $row[1]\n", $i;
157 <      print "     created by $row[2] on $row[3]\n";
157 >      print "     (";
158 >      print color "green" if $row[4] eq "present";
159 >      print color "bold yellow" if $row[4] eq "submitted";
160 >      print color "bold red" if $row[4] eq "created" or $row[4] eq "cancelled" or $row[4] eq "deprecated";
161 >      print $row[4];
162 >      print color "reset";
163 >      print ") created by $row[2] on $row[3]\n";
164      }
165    print "\nWhich entry would you like to modify?";
166    if ($command ne "deleteEntry" && $command ne "deprecate")
# Line 176 | Line 191 | dbUpdate
191    my $userAndHost = shift;
192    my $format = shift;
193    my $location = shift;
194 +  my $name = shift;
195    my $fileListName = shift;
196    my $status = shift;
197    my $comment = shift;
# Line 184 | Line 200 | dbUpdate
200    my $jsonFileName = shift;
201    my $lumiSummaryName = shift;
202    my $release = shift;
203 +  my $globalTag = shift;
204 +  my $configName = shift;
205 +  my $xSection = shift;
206 +  my $ySection = shift;
207 +
208 +  $location = getLocation ($id) if $id > 0
209 +                               && !$crabCfgName
210 +                               && !$comment
211 +                               && !$format
212 +                               && !$globalTag
213 +                               && !$configName
214 +                               && !$jsonFileName
215 +                               && !$location
216 +                               && !$name
217 +                               && !$psetName
218 +                               && !$release
219 +                               && !$lumiSummaryName
220 +                               && !$xSection
221 +                               && !$ySection;
222  
223    my $user = $userAndHost;
224    $user =~ s/@.*$//g;
# Line 255 | Line 290 | dbUpdate
290        close (LUMI_SUMMARY);
291        $lumiSummary = join ("", @lumiSummary);
292      }
293 <  if ($release)
294 <    {
260 <      my $query = "select id from ntupleRelease where name='$release'";
261 <      $db->selectdb ("ntuple");
262 <      my $results = $db->query ($query);
263 <      if ($results->numrows () != 1)
264 <        {
265 <          print "Ntuple release \"$release\" not found!\n";
266 <          exit;
267 <        }
268 <    }
269 <  ($nFiles, $size) = sizeOfDataset ($dataset, $location, $fileList);
293 >  $release .= ".$configName" if $configName;
294 >  ($nFiles, $size) = sizeOfDataset ($location, $fileList);
295    my $fullLocation = $location;
296    $fullLocation = "$ENV{'PWD'}/$location" if !($location =~ m/^\//);
297  
# Line 278 | Line 303 | dbUpdate
303    $jsonFile = addSlashes ($jsonFile);
304    $lumiSummary = addSlashes ($lumiSummary);
305    $fullLocation = addSlashes ($fullLocation);
306 +  $name = addSlashes ($name);
307    $fileList = addSlashes ($fileList);
308    $status = addSlashes ($status);
309    $comment = addSlashes ($comment);
310    $release = addSlashes ($release);
311 +  $globalTag = addSlashes ($globalTag);
312  
313    my $results;
314    my $query;
315    if ($id < 0)
316      {
317 +      $query = "select id from ntuple where dataset='$dataset'";
318 +      $db->selectdb ("ntuple");
319 +      $results = $db->query ($query);
320 +      if ($results->numrows ())
321 +        {
322 +          print "This dataset already exists in the database. Create anyway? (y/N): ";
323 +          my $response = <STDIN>;
324 +          $response =~ s/\n//g;
325 +          $response = "n" if !$response;
326 +          exit if substr (lc ($response), 0, 1) ne 'y';
327 +        }
328 +
329        $query = "select max(id) from ntuple";
330        $db->selectdb ("ntuple");
331        $results = $db->query ($query);
# Line 294 | Line 333 | dbUpdate
333        my $id = 1;
334        $id = $row[0] + 1 if $results->numrows ();
335  
336 <      $query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release')";
336 >      my $columns = "(id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version, globalTag";
337 >      $columns .= ", crossSectionInPicobarn" if $xSection;
338 >      $columns .= ", higherOrderCrossSectionInPicobarn" if $ySection;
339 >      $columns .= ")";
340 >      my $values = "($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release', '$globalTag'";
341 >      $values .= ", $xSection" if $xSection;
342 >      $values .= ", $ySection" if $ySection;
343 >      $values .= ")";
344 >      $query = "insert into ntuple $columns values $values";
345      }
346    if ($id > 0)
347      {
348        my $fields;
349        my $values;
350  
351 <      $values .= ", dataset='$dataset'" if $dataset;
351 >      if ($name)
352 >        {
353 >          $query = "select id from ntuple where dataset='$name'";
354 >          $db->selectdb ("ntuple");
355 >          $results = $db->query ($query);
356 >          if ($results->numrows ())
357 >            {
358 >              print "This dataset already exists in the database. Use this name anyway? (y/N): ";
359 >              my $response = <STDIN>;
360 >              $response =~ s/\n//g;
361 >              $response = "n" if !$response;
362 >              exit if substr (lc ($response), 0, 1) ne 'y';
363 >            }
364 >          $values .= ", dataset='$name'";
365 >        }
366 >
367        $values .= ", lastUpdateTime=now()";
368        $values .= ", lastUpdateUser='$user'";
369        $values .= ", format='$format'" if $format;
# Line 316 | Line 378 | dbUpdate
378        $values .= ", jsonFile='$jsonFile'" if $jsonFile;
379        $values .= ", lumiSummary='$lumiSummary'" if $lumiSummary;
380        $values .= ", version='$release'" if $release;
381 +      $values .= ", globalTag='$globalTag'" if $globalTag;
382 +      $values .= ", crossSectionInPicobarn=$xSection" if $xSection;
383 +      $values .= ", higherOrderCrossSectionInPicobarn=$ySection" if $ySection;
384  
385        $values =~ s/^, //;
386        $query = "update ntuple set $values where id=$id";
# Line 379 | Line 444 | printHelp
444        printf "%-29s%s\n", "  -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs";
445        printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
446        printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format (default: BEAN)";
447 +      printf "%-29s%s\n", "  -g, --globalTag TAG", "global tag";
448 +      printf "%-29s%s\n", "  -i, --configName NAME", "name of config used to produce ntuples";
449        printf "%-29s%s\n", "  -j, --jsonFile FILE", "JSON file used for this dataset";
450        printf "%-29s%s\n", "  -l, --location DIRECTORY", "directory containing the ntuples";
451        printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config used to produce ntuples";
452        printf "%-29s%s\n", "  -r, --release NAME", "ntuple release used to produce ntuples";
453        printf "%-29s%s\n", "  -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB";
454 +      printf "%-29s%s\n", "  -x, --xSection XSEC", "cross section in picobarns for the sample";
455 +      printf "%-29s%s\n", "  -y, --higherOrderXSec XSEC", "higher-order cross section in picobarns for the";
456 +      printf "%-29s%s\n", "                            ", "sample";
457      }
458    elsif ($command eq "createOther")
459      {
# Line 396 | Line 466 | printHelp
466    elsif ($command eq "update")
467      {
468        print "Usage: $exeName [OPTION]... update NAME\n";
469 <      print "Updates an existing database entry for dataset NAME.\n";
469 >      print "Updates an existing database entry for dataset NAME. If no options are given,\n";
470 >      print "updates the number of files and the size on disk of the dataset using the\n";
471 >      print "location in the database.\n";
472        print "\n";
473        print "Mandatory arguments to long options are mandatory for short options too.\n";
474        printf "%-29s%s\n", "  -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs";
475        printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
476        printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format";
477 +      printf "%-29s%s\n", "  -g, --globalTag TAG", "global tag";
478 +      printf "%-29s%s\n", "  -i, --configName NAME", "name of config used to produce ntuples";
479        printf "%-29s%s\n", "  -j, --jsonFile FILE", "JSON file used for this dataset";
480        printf "%-29s%s\n", "  -l, --location DIRECTORY", "directory containing the ntuples";
481 +      printf "%-29s%s\n", "  -n, --name NAME", "rename the entry";
482        printf "%-29s%s\n", "  -o, --other", "update an entry in the non-ntuple database";
483        printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config used to produce ntuples";
484        printf "%-29s%s\n", "  -r, --release NAME", "ntuple release used to produce ntuples";
485        printf "%-29s%s\n", "  -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB";
486 +      printf "%-29s%s\n", "  -x, --xSection XSEC", "cross section in picobarns for the sample";
487 +      printf "%-29s%s\n", "  -y, --higherOrderXSec XSEC", "higher-order cross section in picobarns for the";
488 +      printf "%-29s%s\n", "                            ", "sample";
489      }
490    elsif ($command eq "finish")
491      {
# Line 461 | Line 539 | printHelp
539      }
540    elsif ($command eq "uploadConfig")
541      {
542 <      print "Usage: $exeName -p FILE -r DIRECTORY [OPTION]... uploadConfig NAME\n";
542 >      print "Usage: $exeName -p FILE -r RELEASE [OPTION]... uploadConfig NAME\n";
543        print "Creates an entry in the database for a customized Python configuration file.\n";
544        print "\n";
545        print "Mandatory arguments to long options are mandatory for short options too.\n";
# Line 496 | Line 574 | printHelp
574   sub
575   sizeOfDataset
576   {
499  my $dataset = shift;
577    my $location = shift;
578    my $fileList = shift;
579  
# Line 553 | Line 630 | uploadRelease
630        print "$recipeName does not exist!\n";
631        exit;
632      }
633 <  move ($release, "/home/hart/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped";
633 >  move ($release, "/home/osucms/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped";
634    open (PY_CONFIG, "<$psetName");
635    my @pset = <PY_CONFIG>;
636    close (PY_CONFIG);
# Line 561 | Line 638 | uploadRelease
638    open (RECIPE, "<$recipeName");
639    my @recipe = <RECIPE>;
640    close (RECIPE);
641 <  my $recipe = join ("\n", @recipe);
641 >  my $recipe = join ("", @recipe);
642  
643    my $query = "select max(id) from ntupleRelease";
644    $db->selectdb ("ntuple");
# Line 597 | Line 674 | downloadRelease
674        print "Ntuple release \"$release\" not found!\n";
675        exit;
676      }
600  if (!(-e "/home/hart/public_html/releases/$release.tar.gz"))
601    {
602      print "Release is in the database but no package exists!\n";
603      exit;
604    }
677    if ($pyConfigName)
678      {
679        my @row = $results->fetchrow ();
# Line 609 | Line 681 | downloadRelease
681        print PY_CONFIG $row[1];
682        close (PY_CONFIG);
683      }
684 <  copy ("/home/hart/public_html/releases/$release.tar.gz", "$release.tar.gz");
684 >  `wget "http://cmshead.mps.ohio-state.edu/~osucms/releases/$release.tar.gz"`;
685   }
686  
687   sub
# Line 706 | Line 778 | uploadConfig
778    $db->selectdb ("ntuple");
779    $results = $db->query ($query);
780   }
781 +
782 + sub
783 + locationExists
784 + {
785 +  my $id = shift;
786 +  my $location = shift;
787 +
788 +  $location =~ s/^(.*)\/+$/$1/;
789 +  my $query = "select id from ntuple where location like '$location%' and id!=$id";
790 +  $db->selectdb ("ntuple");
791 +  my $results = $db->query ($query);
792 +  return 1 if $results->numrows ();
793 +
794 +  if ($location =~ m/^\/store\/.*$/)
795 +    {
796 +      $location =~ s/^\/store\/(.*)$/\/data\/se\/store\/$1/;
797 +    }
798 +  elsif ($location =~ m/^\/data\/se\/store\/.*$/)
799 +    {
800 +      $location =~ s/^\/data\/se\/store\/(.*)$/\/store\/$1/;
801 +    }
802 +
803 +  my $query = "select id from ntuple where location like '$location%' and id!=$id";
804 +  $db->selectdb ("ntuple");
805 +  my $results = $db->query ($query);
806 +  return 1 if $results->numrows ();
807 +
808 +  return 0;
809 + }
810 +
811 + sub
812 + getLocation
813 + {
814 +  my $id = shift;
815 +
816 +  my $query = "select location from ntuple where id=$id";
817 +  $db->selectdb ("ntuple");
818 +  my $results = $db->query ($query);
819 +  my @row = $results->fetchrow ();
820 +
821 +  return $row[0];
822 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines