Changeset 42387 for trunk/ippTools/src/pzgetexp.c

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/pzgetexp.c (modified) (3 diffs)

trunk/ippTools/src

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

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

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