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.10 by ahart, Wed Oct 17 18:28:47 2012 UTC vs.
Revision 1.15 by ahart, Fri Nov 30 18:20:59 2012 UTC

# Line 12 | Line 12 | sub dbDelete;
12   sub dbDeleteOther;
13   sub addSlashes;
14   sub uploadRelease;
15 + sub downloadRelease;
16   sub datasetExists;
17 + sub uploadConfig;
18  
19   our $db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User") or die "Failed to connect to Tier 3, stopped";
20  
21   my %opt;
22   Getopt::Long::Configure ("bundling");
23 < 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", "help|h");
23 > 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   my $argc = @ARGV;
25  
26   printHelp ($ARGV[0]) if $opt{"help"};
27   printHelp () if $argc != 2 && $ARGV[0] ne "createOther";
28 < 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 "deleteEntry";
28 > 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";
29   if (($ARGV[0] eq "create" || $ARGV[0] eq "finish") && !$opt{"location"})
30    {
31      print "The directory containing the ntuples must be given!\n";
32      exit;
33    }
34 < if ($ARGV[0] eq "uploadRelease" && !$opt{"pyConfig"} && !$opt{"release"})
34 > if ($ARGV[0] eq "uploadRelease" && (!$opt{"pyConfig"} || !$opt{"release"} || !$opt{"recipe"}))
35    {
36 <    print "Both the Python and the CMSSW release must be given!\n";
36 >    print "The Python config, CMSSW release directory, and recipe file must be given!\n";
37 >    exit;
38 >  }
39 > if ($ARGV[0] eq "uploadConfig" && (!$opt{"pyConfig"} || !$opt{"release"}))
40 >  {
41 >    print "The Python config and ntuple release must be given!\n";
42      exit;
43    }
44   if ($ARGV[0] eq "uploadRelease")
# Line 43 | Line 50 | if ($ARGV[0] eq "uploadRelease")
50      $cmsswRelease =~ s/^.*CMSSW_([^\/]*).*$/CMSSW_$1/;
51      `tar -C $parentDir -czf $ARGV[1].tar.gz $opt{"release"}`;
52      $opt{"format"} = "BEAN" if !$opt{"format"};
53 <    uploadRelease ($opt{"format"}, $cmsswRelease, "$ARGV[1].tar.gz", $opt{"pyConfig"}, $ARGV[1], "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"comment"});
53 >    uploadRelease ($opt{"format"}, $cmsswRelease, "$ARGV[1].tar.gz", $opt{"pyConfig"}, $ARGV[1], "$ENV{'USER'}", $opt{"comment"}, $opt{"recipe"});
54 >  }
55 > elsif ($ARGV[0] eq "downloadRelease")
56 >  {
57 >    downloadRelease ($ARGV[1], $opt{"pyConfig"});
58 >  }
59 > elsif ($ARGV[0] eq "uploadConfig")
60 >  {
61 >    uploadConfig ($ARGV[1], $ENV{"USER"}, $opt{"pyConfig"}, $opt{"release"}, $opt{"comment"});
62    }
63   elsif ($ARGV[0] eq "createOther")
64    {
# Line 158 | Line 173 | dbUpdate
173   {
174    my $id = shift;
175    my $dataset = shift;
176 <  my $user = shift;
176 >  my $userAndHost = shift;
177    my $format = shift;
178    my $location = shift;
179    my $fileListName = shift;
# Line 170 | Line 185 | dbUpdate
185    my $lumiSummaryName = shift;
186    my $release = shift;
187  
188 +  my $user = $userAndHost;
189 +  $user =~ s/@.*$//g;
190 +
191    my $fileList;
192    my $pset;
193    my $crabCfg;
# Line 276 | Line 294 | dbUpdate
294        my $id = 1;
295        $id = $row[0] + 1 if $results->numrows ();
296  
297 <      $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')";
297 >      $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')";
298      }
299    if ($id > 0)
300      {
# Line 394 | Line 412 | printHelp
412    elsif ($command eq "finish")
413      {
414        print "Usage: $exeName -l DIRECTORY finish NAME\n";
397
415        print "Finalizes the database entry for dataset NAME, changing its status to\n";
416        print "\"present\".  This is intended to be the final step in command-line based ntuple\n";
417        print "production.\n";
# Line 420 | Line 437 | printHelp
437      }
438    elsif ($command eq "uploadRelease")
439      {
440 <      print "Usage: $exeName -p FILE -r DIRECTORY [OPTION]... uploadRelease NAME\n";
440 >      print "Usage: $exeName -e FILE -p FILE -r DIRECTORY [OPTION]... uploadRelease NAME\n";
441        print "Copies an ntuple release to the appropriate area on the Tier 3, and creates a\n";
442        print "database entry for it, with NAME being the name of the release. An ntuple\n";
443        print "release is a CMSSW release with all the necessary packages added for creating\n";
# Line 428 | Line 445 | printHelp
445        print "\n";
446        print "Mandatory arguments to long options are mandatory for short options too.\n";
447        printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
448 +      printf "%-29s%s\n", "  -e, --recipe FILE", "file containing the recipe for the release";
449        printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format (default: BEAN)";
450        printf "%-29s%s\n", "  -p, --pyConfig FILE", "default Python config for the release";
451        printf "%-29s%s\n", "  -r, --release DIRECTORY", "CMSSW release containing ntuple packages";
452      }
453 +  elsif ($command eq "downloadRelease")
454 +    {
455 +      print "Usage: $exeName [OPTION]... downloadRelease NAME\n";
456 +      print "Copies an ntuple release to the current directory on the Tier 3. Optionally\n";
457 +      print "copies the corresponding Python configuration file registered in the database.\n";
458 +      print "\n";
459 +      print "Mandatory arguments to long options are mandatory for short options too.\n";
460 +      printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python configuration file name";
461 +    }
462 +  elsif ($command eq "uploadConfig")
463 +    {
464 +      print "Usage: $exeName -p FILE -r DIRECTORY [OPTION]... uploadConfig NAME\n";
465 +      print "Creates an entry in the database for a customized Python configuration file.\n";
466 +      print "\n";
467 +      print "Mandatory arguments to long options are mandatory for short options too.\n";
468 +      printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
469 +      printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config file";
470 +      printf "%-29s%s\n", "  -r, --release NAME", "ntuple release with which to use this config";
471 +    }
472    else
473      {
474        print "Usage: $exeName [OPTION]... COMMAND NAME\n";
# Line 443 | Line 480 | printHelp
480        print "\n";
481        print "COMMAND may be one of the following:\n";
482        printf "%-29s%s\n", "  create", "creates the entry";
483 <      printf "%-29s%s\n", "  create", "creates an entry for non-ntuple data";
483 >      printf "%-29s%s\n", "  createOther", "creates an entry for non-ntuple data";
484        printf "%-29s%s\n", "  update", "updates the entry";
485        printf "%-29s%s\n", "  finish", "finalizes the database entry";
486        printf "%-29s%s\n", "  deleteEntry", "removes the database entry";
487        printf "%-29s%s\n", "  deprecate", "marks the dataset for deletion";
488        printf "%-29s%s\n", "  uploadRelease", "upload an ntuple release";
489 +      printf "%-29s%s\n", "  downloadRelease", "download an ntuple release";
490 +      printf "%-29s%s\n", "  uploadConfig", "upload an ntuple config";
491      }
492  
493    exit;
# Line 502 | Line 541 | uploadRelease
541    my $name = shift;
542    my $user = shift;
543    my $comment = shift;
544 +  my $recipeName = shift;
545  
506  move ($release, "/home/hart/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped";
546    if (!(-e $psetName))
547      {
548        print "$psetName does not exist!\n";
549        exit;
550      }
551 +  if (!(-e $recipeName))
552 +    {
553 +      print "$recipeName does not exist!\n";
554 +      exit;
555 +    }
556 +  move ($release, "/home/hart/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped";
557    open (PY_CONFIG, "<$psetName");
558    my @pset = <PY_CONFIG>;
559    close (PY_CONFIG);
560    my $pset = join ("", @pset);
561 +  open (RECIPE, "<$recipeName");
562 +  my @recipe = <RECIPE>;
563 +  close (RECIPE);
564 +  my $recipe = join ("\n", @recipe);
565  
566    my $query = "select max(id) from ntupleRelease";
567    $db->selectdb ("ntuple");
# Line 527 | Line 576 | uploadRelease
576    $format = addSlashes ($format);
577    $cmsswRelease = addSlashes ($cmsswRelease);
578    $comment = addSlashes ($comment);
579 +  $recipe = addSlashes ($recipe);
580  
581 <  my $query = "insert into ntupleRelease (id, name, pset, user, pending, format, cmsswRelease, comment) values ($id, '$name', '$pset', '$user', 1, '$format', '$cmsswRelease', '$comment')";
581 >  my $query = "insert into ntupleRelease (id, name, pset, user, pending, format, cmsswRelease, comment, recipe) values ($id, '$name', '$pset', '$user', 1, '$format', '$cmsswRelease', '$comment', '$recipe')";
582    $db->selectdb ("ntuple");
583    my $results = $db->query ($query);
584   }
585  
586   sub
587 + downloadRelease
588 + {
589 +  my $release = shift;
590 +  my $pyConfigName = shift;
591 +
592 +  my $query = "select id,pset from ntupleRelease where name='$release'";
593 +  $db->selectdb ("ntuple");
594 +  my $results = $db->query ($query);
595 +  if ($results->numrows () != 1)
596 +    {
597 +      print "Ntuple release \"$release\" not found!\n";
598 +      exit;
599 +    }
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 +    }
605 +  if ($pyConfigName)
606 +    {
607 +      my @row = $results->fetchrow ();
608 +      open (PY_CONFIG, ">$pyConfigName");
609 +      print PY_CONFIG $row[1];
610 +      close (PY_CONFIG);
611 +    }
612 +  copy ("/home/hart/public_html/releases/$release.tar.gz", "$release.tar.gz");
613 + }
614 +
615 + sub
616   dbOtherCreate
617   {
618 <  my $user = shift;
618 >  my $userAndHost = shift;
619    my $listOfFiles = shift;
620    my $comment = shift;
621  
622 +  my $user = $userAndHost;
623 +  $user =~ s/@.*$//g;
624 +
625    my $size = 0.0;
626    my $nFiles = 0.0;
627    for (my $i = 0; $i < @$listOfFiles; $i++)
# Line 570 | Line 652 | dbOtherCreate
652    $location = addSlashes ($location);
653    $comment = addSlashes ($comment);
654  
655 <  my $query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$user', '$user', '$location', $nFiles, $size, '$comment')";
655 >  $query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$userAndHost', '$user', '$location', $nFiles, $size, '$comment')";
656    $db->selectdb ("ntuple");
657 <  my $results = $db->query ($query);
657 >  $results = $db->query ($query);
658  
659    print "ID $id\n";
660   }
661 +
662 + sub
663 + uploadConfig
664 + {
665 +  my $name = shift;
666 +  my $user = shift;
667 +  my $psetName = shift;
668 +  my $release = shift;
669 +  my $comment = shift;
670 +
671 +  if (!(-e $psetName))
672 +    {
673 +      print "$psetName does not exist!\n";
674 +      exit;
675 +    }
676 +  if ($release)
677 +    {
678 +      my $query = "select id from ntupleRelease where name='$release'";
679 +      $db->selectdb ("ntuple");
680 +      my $results = $db->query ($query);
681 +      if ($results->numrows () != 1)
682 +        {
683 +          print "Ntuple release \"$release\" not found!\n";
684 +          exit;
685 +        }
686 +    }
687 +  open (PSET, "<$psetName");
688 +  my @pset = <PSET>;
689 +  close (PSET);
690 +  my $pset = join ("", @pset);
691 +
692 +  my $query = "select max(id) from ntupleConfig";
693 +  $db->selectdb ("ntuple");
694 +  my $results = $db->query ($query);
695 +  my @row = $results->fetchrow ();
696 +  my $id = 1;
697 +  $id = $row[0] + 1 if $results->numrows ();
698 +
699 +  $name = addSlashes ($name);
700 +  $user = addSlashes ($user);
701 +  $pset = addSlashes ($pset);
702 +  $release = addSlashes ($release);
703 +  $comment = addSlashes ($comment);
704 +
705 +  my $query = "insert into ntupleConfig (id, name, pset, user, pending, ntupleRelease, comment) values ($id, '$name', '$pset', '$user', 1, '$release', '$comment')";
706 +  $db->selectdb ("ntuple");
707 +  $results = $db->query ($query);
708 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines