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.13 by ahart, Mon Oct 22 13:50:25 2012 UTC vs.
Revision 1.17 by ahart, Sat Jan 19 07:16:03 2013 UTC

# Line 14 | Line 14 | sub addSlashes;
14   sub uploadRelease;
15   sub downloadRelease;
16   sub datasetExists;
17 + sub uploadConfig;
18 + sub locationExists;
19  
20   our $db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User") or die "Failed to connect to Tier 3, stopped";
21  
22   my %opt;
23   Getopt::Long::Configure ("bundling");
24 < 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");
24 > 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", "help|h");
25   my $argc = @ARGV;
26  
27   printHelp ($ARGV[0]) if $opt{"help"};
28   printHelp () if $argc != 2 && $ARGV[0] ne "createOther";
29 < printHelp () if $ARGV[0] ne "create" && $ARGV[0] ne "createOther" && $ARGV[0] ne "update" && $ARGV[0] ne "finish" && $ARGV[0] ne "deprecate" && $ARGV[0] ne "uploadRelease" && $ARGV[0] ne "downloadRelease" && $ARGV[0] ne "deleteEntry";
29 > printHelp () if $ARGV[0] ne "create" && $ARGV[0] ne "createOther" && $ARGV[0] ne "update" && $ARGV[0] ne "finish" && $ARGV[0] ne "deprecate" && $ARGV[0] ne "uploadRelease" && $ARGV[0] ne "downloadRelease" && $ARGV[0] ne "deleteEntry" && $ARGV[0] ne "uploadConfig";
30   if (($ARGV[0] eq "create" || $ARGV[0] eq "finish") && !$opt{"location"})
31    {
32      print "The directory containing the ntuples must be given!\n";
# Line 35 | Line 37 | if ($ARGV[0] eq "uploadRelease" && (!$op
37      print "The Python config, CMSSW release directory, and recipe file must be given!\n";
38      exit;
39    }
40 + if ($ARGV[0] eq "uploadConfig" && (!$opt{"pyConfig"} || !$opt{"release"}))
41 +  {
42 +    print "The Python config and ntuple release must be given!\n";
43 +    exit;
44 +  }
45 + if ($opt{"location"} && locationExists ($opt{"location"}))
46 +  {
47 +    print "This location is already registered in the database!\n";
48 +    exit;
49 +  }
50   if ($ARGV[0] eq "uploadRelease")
51    {
52      my $parentDir = "./$opt{'release'}";
# Line 50 | Line 62 | elsif ($ARGV[0] eq "downloadRelease")
62    {
63      downloadRelease ($ARGV[1], $opt{"pyConfig"});
64    }
65 + elsif ($ARGV[0] eq "uploadConfig")
66 +  {
67 +    uploadConfig ($ARGV[1], $ENV{"USER"}, $opt{"pyConfig"}, $opt{"release"}, $opt{"comment"});
68 +  }
69   elsif ($ARGV[0] eq "createOther")
70    {
71      my @listOfFiles = @ARGV;
72      @listOfFiles = reverse (@listOfFiles);
73      pop (@listOfFiles);
74      @listOfFiles = reverse (@listOfFiles);
75 <    dbOtherCreate ("$ENV{'USER'}", \@listOfFiles, $opt{"comment"});
75 >    dbOtherCreate ("$ENV{'USER'}\@$ENV{'HOSTNAME'}", \@listOfFiles, $opt{"comment"});
76    }
77   else
78    {
# Line 70 | Line 86 | else
86      $status = "" if $ARGV[0] eq "update";
87      $status = "deprecated" if $ARGV[0] eq "deprecate";
88      $opt{"format"} = "BEAN" if $ARGV[0] eq "create" && !$opt{"format"};
89 <    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"};
89 >    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"}) if !$opt{"other"};
90      dbUpdateOther ($id, $opt{"comment"}, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $opt{"other"};
91      dbDelete ($id) if $ARGV[0] eq "deleteEntry" && !$opt{"other"};
92      dbDeleteOther ($id) if $ARGV[0] eq "deleteEntry" && $opt{"other"};
# Line 163 | Line 179 | dbUpdate
179   {
180    my $id = shift;
181    my $dataset = shift;
182 <  my $user = shift;
182 >  my $userAndHost = shift;
183    my $format = shift;
184    my $location = shift;
185 +  my $name = shift;
186    my $fileListName = shift;
187    my $status = shift;
188    my $comment = shift;
# Line 175 | Line 192 | dbUpdate
192    my $lumiSummaryName = shift;
193    my $release = shift;
194  
195 +  my $user = $userAndHost;
196 +  $user =~ s/@.*$//g;
197 +
198    my $fileList;
199    my $pset;
200    my $crabCfg;
# Line 265 | Line 285 | dbUpdate
285    $jsonFile = addSlashes ($jsonFile);
286    $lumiSummary = addSlashes ($lumiSummary);
287    $fullLocation = addSlashes ($fullLocation);
288 +  $name = addSlashes ($name);
289    $fileList = addSlashes ($fileList);
290    $status = addSlashes ($status);
291    $comment = addSlashes ($comment);
# Line 274 | Line 295 | dbUpdate
295    my $query;
296    if ($id < 0)
297      {
298 +      $query = "select id from ntuple where dataset='$dataset'";
299 +      $db->selectdb ("ntuple");
300 +      $results = $db->query ($query);
301 +      if ($results->numrows ())
302 +        {
303 +          print "This dataset already exists in the database. Create anyway? (y/N): ";
304 +          my $response = <STDIN>;
305 +          $response =~ s/\n//g;
306 +          $response = "n" if !$response;
307 +          exit if substr (lc ($response), 0, 1) ne 'y';
308 +        }
309 +
310        $query = "select max(id) from ntuple";
311        $db->selectdb ("ntuple");
312        $results = $db->query ($query);
# Line 281 | Line 314 | dbUpdate
314        my $id = 1;
315        $id = $row[0] + 1 if $results->numrows ();
316  
317 <      $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(), '$user', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release')";
317 >      $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')";
318      }
319    if ($id > 0)
320      {
321        my $fields;
322        my $values;
323  
324 <      $values .= ", dataset='$dataset'" if $dataset;
324 >      if ($name)
325 >        {
326 >          $query = "select id from ntuple where dataset='$name'";
327 >          $db->selectdb ("ntuple");
328 >          $results = $db->query ($query);
329 >          if ($results->numrows ())
330 >            {
331 >              print "This dataset already exists in the database. Create anyway? (y/N): ";
332 >              my $response = <STDIN>;
333 >              $response =~ s/\n//g;
334 >              $response = "n" if !$response;
335 >              exit if substr (lc ($response), 0, 1) ne 'y';
336 >            }
337 >          $values .= ", dataset='$name'";
338 >        }
339 >
340        $values .= ", lastUpdateTime=now()";
341        $values .= ", lastUpdateUser='$user'";
342        $values .= ", format='$format'" if $format;
# Line 391 | Line 439 | printHelp
439        printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format";
440        printf "%-29s%s\n", "  -j, --jsonFile FILE", "JSON file used for this dataset";
441        printf "%-29s%s\n", "  -l, --location DIRECTORY", "directory containing the ntuples";
442 +      printf "%-29s%s\n", "  -n, --name NAME", "rename the entry";
443        printf "%-29s%s\n", "  -o, --other", "update an entry in the non-ntuple database";
444        printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config used to produce ntuples";
445        printf "%-29s%s\n", "  -r, --release NAME", "ntuple release used to produce ntuples";
# Line 399 | Line 448 | printHelp
448    elsif ($command eq "finish")
449      {
450        print "Usage: $exeName -l DIRECTORY finish NAME\n";
402
451        print "Finalizes the database entry for dataset NAME, changing its status to\n";
452        print "\"present\".  This is intended to be the final step in command-line based ntuple\n";
453        print "production.\n";
# Line 447 | Line 495 | printHelp
495        print "Mandatory arguments to long options are mandatory for short options too.\n";
496        printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python configuration file name";
497      }
498 +  elsif ($command eq "uploadConfig")
499 +    {
500 +      print "Usage: $exeName -p FILE -r DIRECTORY [OPTION]... uploadConfig NAME\n";
501 +      print "Creates an entry in the database for a customized Python configuration file.\n";
502 +      print "\n";
503 +      print "Mandatory arguments to long options are mandatory for short options too.\n";
504 +      printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
505 +      printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config file";
506 +      printf "%-29s%s\n", "  -r, --release NAME", "ntuple release with which to use this config";
507 +    }
508    else
509      {
510        print "Usage: $exeName [OPTION]... COMMAND NAME\n";
# Line 465 | Line 523 | printHelp
523        printf "%-29s%s\n", "  deprecate", "marks the dataset for deletion";
524        printf "%-29s%s\n", "  uploadRelease", "upload an ntuple release";
525        printf "%-29s%s\n", "  downloadRelease", "download an ntuple release";
526 +      printf "%-29s%s\n", "  uploadConfig", "upload an ntuple config";
527      }
528  
529    exit;
# Line 592 | Line 651 | downloadRelease
651   sub
652   dbOtherCreate
653   {
654 <  my $user = shift;
654 >  my $userAndHost = shift;
655    my $listOfFiles = shift;
656    my $comment = shift;
657  
658 +  my $user = $userAndHost;
659 +  $user =~ s/@.*$//g;
660 +
661    my $size = 0.0;
662    my $nFiles = 0.0;
663    for (my $i = 0; $i < @$listOfFiles; $i++)
# Line 626 | Line 688 | dbOtherCreate
688    $location = addSlashes ($location);
689    $comment = addSlashes ($comment);
690  
691 <  my $query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$user', '$user', '$location', $nFiles, $size, '$comment')";
691 >  $query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$userAndHost', '$user', '$location', $nFiles, $size, '$comment')";
692    $db->selectdb ("ntuple");
693 <  my $results = $db->query ($query);
693 >  $results = $db->query ($query);
694  
695    print "ID $id\n";
696   }
697 +
698 + sub
699 + uploadConfig
700 + {
701 +  my $name = shift;
702 +  my $user = shift;
703 +  my $psetName = shift;
704 +  my $release = shift;
705 +  my $comment = shift;
706 +
707 +  if (!(-e $psetName))
708 +    {
709 +      print "$psetName does not exist!\n";
710 +      exit;
711 +    }
712 +  if ($release)
713 +    {
714 +      my $query = "select id from ntupleRelease where name='$release'";
715 +      $db->selectdb ("ntuple");
716 +      my $results = $db->query ($query);
717 +      if ($results->numrows () != 1)
718 +        {
719 +          print "Ntuple release \"$release\" not found!\n";
720 +          exit;
721 +        }
722 +    }
723 +  open (PSET, "<$psetName");
724 +  my @pset = <PSET>;
725 +  close (PSET);
726 +  my $pset = join ("", @pset);
727 +
728 +  my $query = "select max(id) from ntupleConfig";
729 +  $db->selectdb ("ntuple");
730 +  my $results = $db->query ($query);
731 +  my @row = $results->fetchrow ();
732 +  my $id = 1;
733 +  $id = $row[0] + 1 if $results->numrows ();
734 +
735 +  $name = addSlashes ($name);
736 +  $user = addSlashes ($user);
737 +  $pset = addSlashes ($pset);
738 +  $release = addSlashes ($release);
739 +  $comment = addSlashes ($comment);
740 +
741 +  my $query = "insert into ntupleConfig (id, name, pset, user, pending, ntupleRelease, comment) values ($id, '$name', '$pset', '$user', 1, '$release', '$comment')";
742 +  $db->selectdb ("ntuple");
743 +  $results = $db->query ($query);
744 + }
745 +
746 + sub
747 + locationExists
748 + {
749 +  my $location = shift;
750 +
751 +  $location =~ s/^(.*)\/+$/$1/;
752 +  my $query = "select id from ntuple where location like '$location%'";
753 +  $db->selectdb ("ntuple");
754 +  my $results = $db->query ($query);
755 +  return 1 if $results->numrows ();
756 +
757 +  if ($location =~ m/^\/store\/.*$/)
758 +    {
759 +      $location =~ s/^\/store\/(.*)$/\/data\/se\/store\/$1/;
760 +    }
761 +  elsif ($location =~ m/^\/data\/se\/store\/.*$/)
762 +    {
763 +      $location =~ s/^\/data\/se\/store\/(.*)$/\/store\/$1/;
764 +    }
765 +
766 +  my $query = "select id from ntuple where location like '$location%'";
767 +  $db->selectdb ("ntuple");
768 +  my $results = $db->query ($query);
769 +  return 1 if $results->numrows ();
770 +
771 +  return 0;
772 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines