IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38250


Ignore:
Timestamp:
May 8, 2015, 10:49:55 AM (11 years ago)
Author:
bills
Message:

Initial work to support two IPP databases (gpc1 and gpc2). Plotting stuff
doesn't work but updates of the stage tables does

Location:
trunk/ippMonitor/czartool
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/czartool/czarDbSchema.sql

    r38212 r38250  
    2626  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    2727  `label` varchar(128) default 'NONE',
     28  `dbname` varchar(128) default 'NONE',
    2829  `pending` bigint(20) NOT NULL,
    2930  `processed` bigint(20) NOT NULL,
    3031  `faults` bigint(20) NOT NULL,
    31   KEY `burntoolIndex` (`timestamp`,`label`)
     32  KEY `burntoolIndex` (`timestamp`,`label`, `dbname`)
    3233) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    3334SET character_set_client = @saved_cs_client;
    … …  
    4344  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    4445  `label` varchar(128) default 'NONE',
    45   `pending` bigint(20) NOT NULL,
    46   `faults` bigint(20) NOT NULL,
    47   `processed` bigint(20) NOT NULL default '0',
    48   KEY `camIndex` (`timestamp`,`label`)
     46  `dbname` varchar(128) default 'NONE',
     47  `pending` bigint(20) NOT NULL,
     48  `faults` bigint(20) NOT NULL,
     49  `processed` bigint(20) NOT NULL default '0',
     50  KEY `camIndex` (`timestamp`,`label`, `dbname`)
    4951) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    5052SET character_set_client = @saved_cs_client;
    … …  
    6062  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    6163  `label` varchar(128) default 'NONE',
    62   `pending` bigint(20) NOT NULL,
    63   `faults` bigint(20) NOT NULL,
    64   `processed` bigint(20) NOT NULL default '0',
    65   KEY `chipIndex` (`timestamp`,`label`)
     64  `dbname` varchar(128) default 'NONE',
     65  `pending` bigint(20) NOT NULL,
     66  `faults` bigint(20) NOT NULL,
     67  `processed` bigint(20) NOT NULL default '0',
     68  KEY `chipIndex` (`timestamp`,`label`, `dbname`)
    6669) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    6770SET character_set_client = @saved_cs_client;
    … …  
    160163  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    161164  `label` varchar(128) default 'NONE',
    162   `pending` bigint(20) NOT NULL,
    163   `faults` bigint(20) NOT NULL,
    164   `processed` bigint(20) NOT NULL default '0',
    165   KEY `diffIndex` (`timestamp`,`label`)
     165  `dbname` varchar(128) default 'NONE',
     166  `pending` bigint(20) NOT NULL,
     167  `faults` bigint(20) NOT NULL,
     168  `processed` bigint(20) NOT NULL default '0',
     169  KEY `diffIndex` (`timestamp`,`label`, `dbname`)
    166170) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    167171SET character_set_client = @saved_cs_client;
    … …  
    177181  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    178182  `label` varchar(128) default 'NONE',
    179   `pending` bigint(20) NOT NULL,
    180   `faults` bigint(20) NOT NULL,
    181   `processed` bigint(20) NOT NULL default '0',
    182   KEY `distIndex` (`timestamp`,`label`)
     183  `dbname` varchar(128) default 'NONE',
     184  `pending` bigint(20) NOT NULL,
     185  `faults` bigint(20) NOT NULL,
     186  `processed` bigint(20) NOT NULL default '0',
     187  KEY `distIndex` (`timestamp`,`label`, `dbname`)
    183188) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    184189SET character_set_client = @saved_cs_client;
    … …  
    194199  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    195200  `label` varchar(128) default 'NONE',
    196   `pending` bigint(20) NOT NULL,
    197   `faults` bigint(20) NOT NULL,
    198   `processed` bigint(20) NOT NULL default '0',
    199   KEY `fakeIndex` (`timestamp`,`label`)
     201  `dbname` varchar(128) default 'NONE',
     202  `pending` bigint(20) NOT NULL,
     203  `faults` bigint(20) NOT NULL,
     204  `processed` bigint(20) NOT NULL default '0',
     205  KEY `fakeIndex` (`timestamp`,`label`, `dbname`)
    200206) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    201207SET character_set_client = @saved_cs_client;
    … …  
    262268  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    263269  `label` varchar(128) default 'NONE',
    264   `pending` bigint(20) NOT NULL,
    265   `faults` bigint(20) NOT NULL,
    266   `processed` bigint(20) NOT NULL default '0',
    267   KEY `magicIndex` (`timestamp`,`label`)
     270  `dbname` varchar(128) default 'NONE',
     271  `pending` bigint(20) NOT NULL,
     272  `faults` bigint(20) NOT NULL,
     273  `processed` bigint(20) NOT NULL default '0',
     274  KEY `magicIndex` (`timestamp`,`label`, `dbname`)
    268275) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    269276SET character_set_client = @saved_cs_client;
    … …  
    279286  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    280287  `label` varchar(128) default 'NONE',
    281   `pending` bigint(20) NOT NULL,
    282   `faults` bigint(20) NOT NULL,
    283   `processed` bigint(20) NOT NULL default '0',
    284   KEY `magicDSIndex` (`timestamp`,`label`)
     288  `dbname` varchar(128) default 'NONE',
     289  `pending` bigint(20) NOT NULL,
     290  `faults` bigint(20) NOT NULL,
     291  `processed` bigint(20) NOT NULL default '0',
     292  KEY `magicDSIndex` (`timestamp`,`label`, `dbname`)
    285293) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    286294SET character_set_client = @saved_cs_client;
    … …  
    360368  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    361369  `label` varchar(128) default 'NONE',
     370  `dbname` varchar(128) default 'NONE',
    362371  `pending` bigint(20) NOT NULL,
    363372  `processed` bigint(20) NOT NULL,
    364373  `faults` bigint(20) NOT NULL,
    365   KEY `pubIndex` (`timestamp`,`label`)
     374  KEY `pubIndex` (`timestamp`,`label`, `dbname`)
    366375) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    367376SET character_set_client = @saved_cs_client;
    … …  
    434443  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    435444  `label` varchar(128) default 'NONE',
    436   `pending` bigint(20) NOT NULL,
    437   `faults` bigint(20) NOT NULL,
    438   `processed` bigint(20) NOT NULL default '0',
    439   KEY `stackIndex` (`timestamp`,`label`)
     445  `dbname` varchar(128) default 'NONE',
     446  `pending` bigint(20) NOT NULL,
     447  `faults` bigint(20) NOT NULL,
     448  `processed` bigint(20) NOT NULL default '0',
     449  KEY `stackIndex` (`timestamp`,`label`, `dbname`)
    440450) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    441451SET character_set_client = @saved_cs_client;
    … …  
    451461  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
    452462  `label` varchar(128) default 'NONE',
    453   `pending` bigint(20) NOT NULL,
    454   `faults` bigint(20) NOT NULL,
    455   `processed` bigint(20) NOT NULL default '0',
    456   KEY `warpIndex` (`timestamp`,`label`)
     463  `dbname` varchar(128) default 'NONE',
     464  `pending` bigint(20) NOT NULL,
     465  `faults` bigint(20) NOT NULL,
     466  `processed` bigint(20) NOT NULL default '0',
     467  KEY `warpIndex` (`timestamp`,`label`, `dbname`)
     468) ENGINE=InnoDB DEFAULT CHARSET=latin1;
     469SET character_set_client = @saved_cs_client;
     470
     471--
     472-- Table structure for table `staticsky`
     473--
     474
     475DROP TABLE IF EXISTS `staticsky`;
     476SET @saved_cs_client     = @@character_set_client;
     477SET character_set_client = utf8;
     478CREATE TABLE `staticsky` (
     479  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
     480  `label` varchar(128) default 'NONE',
     481  `dbname` varchar(128) default 'NONE',
     482  `pending` bigint(20) NOT NULL,
     483  `faults` bigint(20) NOT NULL,
     484  `processed` bigint(20) NOT NULL default '0',
     485  KEY `staticskyIndex` (`timestamp`,`label`, `dbname`)
     486) ENGINE=InnoDB DEFAULT CHARSET=latin1;
     487SET character_set_client = @saved_cs_client;
     488--
     489-- Table structure for table `fullforce`
     490--
     491
     492DROP TABLE IF EXISTS `fullforce`;
     493SET @saved_cs_client     = @@character_set_client;
     494SET character_set_client = utf8;
     495CREATE TABLE `fullforce` (
     496  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
     497  `label` varchar(128) default 'NONE',
     498  `dbname` varchar(128) default 'NONE',
     499  `pending` bigint(20) NOT NULL,
     500  `faults` bigint(20) NOT NULL,
     501  `processed` bigint(20) NOT NULL default '0',
     502  KEY `fullforceIndex` (`timestamp`,`label`, `dbname`)
     503) ENGINE=InnoDB DEFAULT CHARSET=latin1;
     504SET character_set_client = @ssaved_cs_client;
     505--
     506-- Table structure for table `chipbackground`
     507--
     508
     509DROP TABLE IF EXISTS `chipbackground`;
     510SET @saved_cs_client     = @@character_set_client;
     511SET character_set_client = utf8;
     512CREATE TABLE `chipbackground` (
     513  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
     514  `label` varchar(128) default 'NONE',
     515  `dbname` varchar(128) default 'NONE',
     516  `pending` bigint(20) NOT NULL,
     517  `faults` bigint(20) NOT NULL,
     518  `processed` bigint(20) NOT NULL default '0',
     519  KEY `chipbackgroundIndex` (`timestamp`,`label`, `dbname`)
    457520) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    458521SET character_set_client = @saved_cs_client;
    … …  
    476539/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
    477540/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
    478 
    479 -- Dump completed on 2012-03-06  6:00:30

  • trunk/ippMonitor/czartool/czarpoll.pl

    r38206 r38250  
    3232my $czarDb = $config->getCzarDbInstance();
    3333my $gpc1Db = $config->getGpc1Instance;
     34my $gpc2Db = $config->getGpc2Instance;
    3435my $nebulous = new czartool::Nebulous($czarDb);
    3536my $pantasks = new czartool::Pantasks();
    … …  
    4748        "fullforce",
    4849        "dist",
     50        "fullforce",
    4951        "pub");
    5052
    … …  
    331333
    332334    print "* Updating stage data\n";
    333     my $totalNew = undef;
    334     my $totalFaults = undef;
    335     my $totalFull = undef;
     335    my $totalNew1 = 0;
     336    my $totalFaults1 = 0;
     337    my $totalFull1 = 0;
     338    my $totalNew2 = 0;
     339    my $totalFaults2 = 0;
     340    my $totalFull2 = 0;
    336341    my $stage = undef;
    337342    my $reverting = 0;
    … …  
    352357        print "* Checking labels for $stage stage\n";
    353358
    354         $totalNew=$totalFaults=$totalFull=0;
     359        $totalNew1=$totalFaults1=$totalFull1=0;
     360        $totalNew2=$totalFaults2=$totalFull2=0;
    355361        foreach $row ( @{$rows} ) {
    356362            my ($label) = @{$row};
    … …  
    358364            chomp($label);
    359365
    360             if ($stage eq "burntool") {
    361 
    362                 $new = $full = $faults = 0;
    363                 if ($labelServer eq "stdscience") {
    364 
    365                     $full = $gpc1Db->countRegisteredExposures($label, $today);
    366                 }
    367             }
    368             else {
    369 
    370                 $new = $gpc1Db->countExposures($label, $stage, $newState);
    371                 $full = $gpc1Db->countExposures($label, $stage, "full");
    372                 $faults = $gpc1Db->countFaults($label, $stage, $newState);
    373             }
     366            $new = $gpc1Db->countExposures($label, $stage, $newState);
     367            $full = $gpc1Db->countExposures($label, $stage, "full");
     368            $faults = $gpc1Db->countFaults($label, $stage, $newState);
    374369            #printf("%s  %s, %s, %d, %d\n", $labelServer, $label, $stage, $new, $faults);
    375             $totalNew += $new;
    376             $totalFull += $full;
    377             $totalFaults += $faults;
    378 
    379             $czarDb->insertNewTimeData($stage, $label, $new, $full, $faults);
    380         }
    381 
    382         $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", $totalNew, $totalFull, $totalFaults);
    383     }
    384 }
    385 
     370            $totalNew1 += $new;
     371            $totalFull1 += $full;
     372            $totalFaults1 += $faults;
     373
     374            $czarDb->insertNewTimeData($stage, $label, 'gpc1', $new, $full, $faults);
     375
     376            $new = $gpc2Db->countExposures($label, $stage, $newState);
     377            $full = $gpc2Db->countExposures($label, $stage, "full");
     378            $faults = $gpc2Db->countFaults($label, $stage, $newState);
     379            #printf("%s  %s, %s, %d, %d\n", $labelServer, $label, $stage, $new, $faults);
     380            $totalNew2 += $new;
     381            $totalFull2 += $full;
     382            $totalFaults2 += $faults;
     383
     384            $czarDb->insertNewTimeData($stage, $label, 'gpc2', $new, $full, $faults);
     385        }
     386
     387        $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", 'gpc1', $totalNew1, $totalFull1, $totalFaults1);
     388        $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", 'gpc2', $totalNew2, $totalFull2, $totalFaults2);
     389    }
     390}
     391

  • trunk/ippMonitor/czartool/czartool/Config.pm

    r32096 r38250  
    5656    $self->{gpc1user} = $xc->findvalue('//gpc1database/user');
    5757    $self->{gpc1password} = $xc->findvalue('//gpc1database/password');
     58
     59    # gpc2 db
     60    $self->{gpc2name} = $xc->findvalue('//gpc2database/name');
     61    $self->{gpc2host} = $xc->findvalue('//gpc2database/host');
     62    $self->{gpc2user} = $xc->findvalue('//gpc2database/user');
     63    $self->{gpc2password} = $xc->findvalue('//gpc2database/password');
    5864
    5965    # czar db
    … …  
    103109            $self->{gpc1password});
    104110}
     111###########################################################################
     112#
     113# Returns an instance of the gpc2 database
     114#
     115###########################################################################
     116sub getGpc2Instance {
     117    my ($self) = @_;
     118
     119    return new czartool::Gpc1Db(
     120            $self->{gpc2name},
     121            $self->{gpc2host},
     122            $self->{gpc2user},
     123            $self->{gpc2password});
     124}
    105125
    106126###########################################################################

  • trunk/ippMonitor/czartool/czartool/CzarDb.pm

    r38216 r38250  
    360360###########################################################################
    361361sub insertNewTimeData {
    362     my ($self, $stage, $label, $pending, $processed, $faults) = @_;
     362    my ($self, $stage, $label, $dbname, $pending, $processed, $faults) = @_;
    363363
    364364    my $query = $self->{_db}->prepare(<<SQL);
    365365    INSERT INTO $stage
    366         (label, pending, processed, faults)
     366        (label, dbname, pending, processed, faults)
    367367        VALUES
    368         ('$label', $pending, $processed, $faults);
     368        ('$label', '$dbname', $pending, $processed, $faults);
    369369SQL
    370370

  • trunk/ippMonitor/czartool/czartool/DayMetrics.pm

    r38206 r38250  
    7878    print $htmlFile "<a href=\"../$previousDay/index.html\"> \< previous day</a> | <a href=\"../index.html\">all</a> | <a href=\"../$nextDay/index.html\">next day \></a><br>\n";
    7979    print $htmlFile "Measured from $self->{begin} to $self->{end} HST<br>\n";
    80     printf ( $htmlFile "%d exposures taken on summit last night, %d through chip today</h5>\n",
    81             $summitExposures, $chipMetrics->getProcessed() ? $chipMetrics->getProcessed() : 0 );
     80    printf $htmlFile "%d exposures taken on summit last night, %d through chip today</h5>\n",
     81            $summitExposures, $chipMetrics->getProcessed() ? $chipMetrics->getProcessed() : 0 ;
    8282    print $htmlFile "</head>\n";
    8383    print $htmlFile "<body>\n";
Note: See TracChangeset for help on using the changeset viewer.