Changeset 36536 for branches/eam_branches/ipp-20140206

Timestamp:

Feb 18, 2014, 2:53:55 PM (12 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20140206

Files:

• . (modified) (1 prop)
• Nebulous (modified) (1 prop)
• Nebulous-Server (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libohana/src (modified) (1 prop)
• Ohana/src/relastro/src (modified) (1 prop)
• dbconfig/README (modified) (1 diff)
• dbconfig/cam.md (modified) (1 prop)
• dbconfig/changes.txt (modified) (3 diffs, 1 prop)
• dbconfig/ipp.m4 (modified) (1 diff)
• dbconfig/remote.md (copied) (copied from trunk/dbconfig/remote.md )
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/chip_imfile.pl (modified) (1 prop)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 diff, 1 prop)
• ippScripts/scripts/lap_science.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippScripts/scripts/publish_file.pl (modified) (1 prop)
• ippScripts/scripts/register_imfile.pl (modified) (2 diffs)
• ippScripts/scripts/warp_skycell.pl (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippTasks/pantasks.pro (modified) (1 diff)
• ippTasks/summit.copy.pro (modified) (1 diff)
• ippToPsps (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff, 1 prop)
• ippTools/share/remotetool_definebyquery_cam.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_cam.sql )
• ippTools/share/remotetool_definebyquery_chip.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_chip.sql )
• ippTools/share/remotetool_definebyquery_stack.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_stack.sql )
• ippTools/share/remotetool_definebyquery_warp.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_warp.sql )
• ippTools/share/remotetool_updatepoll.sql (copied) (copied from trunk/ippTools/share/remotetool_updatepoll.sql )
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/Makefile.am (modified) (3 diffs)
• ippTools/src/camtool.c (modified) (1 prop)
• ippTools/src/camtoolConfig.c (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippTools/src/remotetool.c (copied) (copied from trunk/ippTools/src/remotetool.c )
• ippTools/src/remotetool.h (copied) (copied from trunk/ippTools/src/remotetool.h )
• ippTools/src/remotetoolConfig.c (copied) (copied from trunk/ippTools/src/remotetoolConfig.c )
• ippconfig (modified) (1 prop)
• ippconfig/gpc1 (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psLib/src/math/psMixtureModels.c (modified) (1 prop)
• psModules (modified) (1 prop)
• psconfig (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• psvideophot (modified) (1 prop)

branches/eam_branches/ipp-20140206/dbconfig/README

@@ -10 +10 @@
    edit the oldtable.md
 
-2. figure out what changes are needed to get the gpc1/isp up to the current
-schema.  Add those changes at the bottom of changes.txt, and modify gpc1/isp.
+2. figure out what changes are needed to get the gpc1/isp/uip/ssp up
+   to the current schema.  Add those changes at the bottom of
+   changes.txt, and modify gpc1/isp/uip/ssp.
 
 3. edit ippTools/share/pxadmin_create_tables.sql.  This is the sql that creates
-an empty database.
+   an empty database.
+
+

branches/eam_branches/ipp-20140206/dbconfig/changes.txt

@@ -2392 +2392 @@
     state   VARCHAR(16),
     label   VARCHAR(654),
-    registered TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+    registered TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     fault   SMALLINT,
     PRIMARY KEY(seq_id, projection_cell),
@@ -2412 +2412 @@
 -- unique keys for the release tables
 
-alter table relStack  add unique key (rel_id, tess_id, skycell_id, filter, stack_type, mjd_obs)
+alter table relStack  add unique key (rel_id, tess_id, skycell_id, filter, stack_type, mjd_obs);
 alter table relExp add UNIQUE KEY(rel_id, exp_id);
 alter table ippRelease add unique key (surveyID, release_name);
@@ -2494 +2494 @@
 UPDATE dbversion set schema_version = '1.1.78', updated= CURRENT_TIMESTAMP();
 
+--
+
+CREATE TABLE remoteRun (
+    remote_id BIGINT NOT NULL AUTO_INCREMENT,
+    state     VARCHAR(64) NOT NULL,
+    stage     VARCHAR(64) NOT NULL,
+    label     VARCHAR(64) NOT NULL,
+    path_base VARCHAR(255) NOT NULL,
+    job_id    BIGINT,
+    last_poll TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fault     SMALLINT NOT NULL,
+    PRIMARY KEY (remote_id),
+    KEY (state),
+    KEY (stage),
+    KEY (label),
+    KEY (job_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;    
+
+CREATE TABLE remoteComponent (
+    remote_id BIGINT,
+    stage_id  BIGINT,
+    KEY (stage_id),
+    FOREIGN KEY (remote_id) REFERENCES remoteRun(remote_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;    
+
+UPDATE dbversion set schema_version = '1.1.79', updated= CURRENT_TIMESTAMP();
+
+

branches/eam_branches/ipp-20140206/dbconfig/ipp.m4

@@ -41 +41 @@
 include(release.md)
 include(ff.md)
+include(remote.md)

branches/eam_branches/ipp-20140206/ippScripts/scripts/ipp_apply_burntool_single.pl

@@ -197 +197 @@
     my $status = vsystem ("$regtool -dbname $dbname -updateprocessedimfile -exp_id $exp_id -class_id $class_id -burntool_state -1", $REALRUN);
     if ($status) {
-        &my_die("failed to update imfile");
+        &my_die("failed to update imfile",$exp_id,$class_id);
     }
     $burntool_state = 1;

branches/eam_branches/ipp-20140206/ippScripts/scripts/register_imfile.pl

@@ -330 +330 @@
             unless ($success) {
                 $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                warn ("Unable to perform regtool -addprocessedimfile: $error_code");
-                exit($error_code);
+                warn ("Unable to perform regtool -updateprocessedimfile: $error_code");
+#                exit($error_code);
+            &my_die_for_update("Unable to perform updateprocessedimfile",
+                               $exp_id, $class_id, $error_code);
+
             }
         } else {
@@ -522 +525 @@
     carp($msg);
     if (defined $exp_id && defined $class_id and not $no_update) {
+        sleep(5);
         my $command = "$regtool -updateprocessedimfile";
         $command .= " -exp_id $exp_id";

branches/eam_branches/ipp-20140206/ippTasks/pantasks.pro

@@ -490 +490 @@
     book delpage $1 -key pantaskState UNKNOWN_ERR
     book delpage $1 -key pantaskState CRASH_ERR
+    book delpage $1 -key pantaskState CRASH
+    book delpage $1 -key pantaskState TIMEOUT
   end
 end

branches/eam_branches/ipp-20140206/ippTasks/summit.copy.pro

@@ -34 +34 @@
 macro copy.status
     book listbook pzPendingImfile
+end
+
+macro copy.reset
+    book init pzPendingExp
+    book init pzPendingImfile
+    book init pzPendingAdvance
+end
+
+# aliases because copy.* isn't intuitive
+macro pztool.reset
+    copy.reset
+end
+
+macro summitcopy.reset
+    summitcopy.reset
 end
 

branches/eam_branches/ipp-20140206/ippTools/share/Makefile.am

@@ -496 +496 @@
         fftool_summary.sql \
         fftool_todo.sql \
-        fftool_toadvance.sql
+        fftool_toadvance.sql \
+        remotetool_definebyquery_chip.sql \
+        remotetool_definebyquery_cam.sql \
+        remotetool_definebyquery_warp.sql \
+        remotetool_definebyquery_stack.sql \
+        remotetool_updatepoll.sql
 
+
+

branches/eam_branches/ipp-20140206/ippTools/share/pxadmin_create_tables.sql

@@ -2365 +2365 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE remoteRun (
+    remote_id BIGINT NOT NULL AUTO_INCREMENT,
+    state     VARCHAR(64) NOT NULL,
+    stage     VARCHAR(64) NOT NULL,
+    label     VARCHAR(64) NOT NULL,
+    path_base VARCHAR(255) NOT NULL,
+    job_id    BIGINT,
+    last_poll TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fault     SMALLINT NOT NULL,
+    PRIMARY KEY (remote_id),
+    KEY (state),
+    KEY (stage),
+    KEY (label),
+    KEY (job_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE remoteComponent (
+    remote_id BIGINT,
+    stage_id  BIGINT,
+    KEY (stage_id),
+    FOREIGN KEY (remote_id) REFERENCES remoteRun(remote_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 -- These comment lines are here to avoid an empty query error.

branches/eam_branches/ipp-20140206/ippTools/src/Makefile.am

@@ -34 +34 @@
         sctool \
         releasetool \
-        fftool
+        fftool \
+        remotetool
 
 pkginclude_HEADERS = \
@@ -89 +90 @@
         sctool.h \
         releasetool.h \
-        fftool.h
+        fftool.h \
+        remotetool.h 
 
 lib_LTLIBRARIES = libpxtools.la
@@ -340 +342 @@
     fftoolConfig.c
 
+remotetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+remotetool_LDADD  = $(PSLIB_LIBS)   $(PSMODULES_LIBS)   $(IPPDB_LIBS)   libpxtools.la
+remotetool_SOURCES = \
+    remotetool.c \
+    remotetoolConfig.c
+
 clean-local:
         -rm -f TAGS