Changeset 42387 for trunk/ippTools/src

Timestamp:

Feb 8, 2023, 12:14:39 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. add safety to pxadmin to prevent drop of ops dbs, add fpcamera, more flexibility in ippadmin for testing; prevent pzgetexp from trying to download too many exposures

Location:

trunk/ippTools

Files:

• . (modified) (1 prop)
• src (modified) (2 props)
• src/Makefile.am (modified) (5 diffs)
• src/fpcamtool.c (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/src/fpcamtool.c )
• src/fpcamtool.h (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/src/fpcamtool.h )
• src/fpcamtoolConfig.c (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/src/fpcamtoolConfig.c )
• src/pxadmin.c (modified) (1 diff)
• src/pxcam.c (modified) (1 diff)
• src/pxfpcam.c (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/src/pxfpcam.c )
• src/pxfpcam.h (copied) (copied from branches/eam_branches/ipp-20220316/ippTools/src/pxfpcam.h )
• src/pzgetexp.c (modified) (3 diffs)

trunk/ippTools/src

@@ -49 +49 @@
 fftool
 remotetool
-
+fpcamtool

@@ -49 +49 @@
 fftool
 remotetool
-
+fpcamtool

trunk/ippTools/src/Makefile.am

@@ -35 +35 @@
         releasetool \
         fftool \
+        fpcamtool \
         remotetool
 
@@ -55 +56 @@
         pxtoolsErrorCodes.h \
         pxtree.h \
+        pxfpcam.h \
         pxwarp.h
 
@@ -91 +93 @@
         releasetool.h \
         fftool.h \
+        fpcamtool.h \
         remotetool.h 
 
@@ -116 +119 @@
         pxtoolsErrorCodes.c \
         pxtree.c \
+        pxfpcam.c \
         pxwarp.c
 
@@ -174 +178 @@
     camtool.c \
     camtoolConfig.c
+
+fpcamtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+fpcamtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+fpcamtool_SOURCES = \
+    fpcamtool.c \
+    fpcamtoolConfig.c
 
 faketool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)

trunk/ippTools/src/pxadmin.c

@@ -184 +184 @@
         psString dbName = name->data.str;
 
+        // if name is e.g., gpc1, strcasecmp returns FALSE
+        bool allowDelete = true;
+        allowDelete = allowDelete && strcasecmp(dbName, "gpc1");  
+        allowDelete = allowDelete && strcasecmp(dbName, "gpc2");  
+        allowDelete = allowDelete && strcasecmp(dbName, "nebulous");  
+        allowDelete = allowDelete && strcasecmp(dbName, "isp");  
+        allowDelete = allowDelete && strcasecmp(dbName, "ssp");  
+        allowDelete = allowDelete && strcasecmp(dbName, "uic");  
+        allowDelete = allowDelete && strcasecmp(dbName, "hsc_v1");  
+        allowDelete = allowDelete && strcasecmp(dbName, "megacam_v1");  
+
+        if (!allowDelete) {
+            fprintf (stdout, "**** WARNING: not allowed to delete database %s.\n", dbName);
+            return false;
+        }
+
         fprintf(stdout, "*** delete the tables from database %s? ***\n", dbName);
         fprintf(stdout, "*** to delete the tables, answer YES, and give password ***\n");

trunk/ippTools/src/pxcam.c

@@ -174 +174 @@
                          "new", // state
                          workdir  ? workdir  : "NULL",
-                         "dirty", //workdir_state
+                         "dirty", // workdir_state
                          label    ? label    : "NULL",
                          data_group ? data_group : "NULL",

trunk/ippTools/src/pzgetexp.c

@@ -136 +136 @@
     psFree(cmdOutput);
     if (!newSummitExps) {
-        // XXX not nessicarily an error
+        // XXX not necessarily an error?
         psError(PS_ERR_UNKNOWN, true, "no new fileSet/exp IDs");
         return false;
@@ -145 +145 @@
         return true;
     }
+    // If we supply an unknown last_fileset (exposure name) to the summit datastore,
+    // it will return all filesets it knows about.  This can cause problems (table overflow)
+    // if this is too large a number.  Raise an error and let the user fix the underlying
+    // problem (last exposure not known to the summit datastore)
+    // Do we need to be able to configure this number?
+    if (psArrayLength(newSummitExps) > 10000) {
+        psError(PS_ERR_UNKNOWN, true, "too many new fileSet/exp IDs? unknown exposure? problem with summitExp table?");
+        return false;
+    }
 
     // start a transaction so it's all rows or nothing
@@ -153 +162 @@
     }
 
-    // increase memory table size limits; deafult is 16MB
-    {
+    // increase memory table size limits; default is 16MB, but our current (2022) config
+    // in /etc/mysql/my.cnf sets to default to 1024M.
+    // This command sets the max_heap_table_size within the transaction, and does not
+    // apparently stick.  But this is not really needed, so we are deactivating it.
+    if (0) {
         // 512MB
         char *query = "SET max_heap_table_size = 1024*1024*512";

@@ -49 +49 @@
 fftool
 remotetool
-
+fpcamtool