Changeset 38884

Timestamp:

Oct 18, 2015, 10:21:02 AM (11 years ago)

Author:

eugene

Message:

test queries to all 3 connections to keep them alive while dvopsps runs

Location:

trunk/ippToPsps/jython

Files:

• diffobjectbatch.py (modified) (1 diff)
• dvo.py (modified) (3 diffs)
• forcedobjectbatch.py (modified) (1 diff)
• insert.dvodb.info.py (modified) (1 diff)
• objectbatch.py (modified) (1 diff)
• queue.py (modified) (1 diff)
• removepending.py (modified) (1 diff)

trunk/ippToPsps/jython/diffobjectbatch.py

@@ -54 +54 @@
 
        try:
-           self.dvoDiffObjects = DvoDiffObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+           self.dvoDiffObjects = DvoDiffObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
        except:
            self.logger.errorPair("Unable to create instance of", "DvoDiffObjects")

trunk/ippToPsps/jython/dvo.py

@@ -158 +158 @@
     def dvopspsRunWithPoll(self,cmd,myTable,waittime):
 
-        # timeout_sql = "set wait_timeout = 5"
-        # self.scratchDb.execute(timeout_sql)
-
-        ## sql = "set global wait_timeout = 4"
-        ## print "---- sql: " + sql
-        ## self.scratchDb.execute(sql)
+        # sql = "set global wait_timeout = 2"
+        # print "---- sql: " + sql
+        # self.scratchDb.execute(sql)
 
         (dvoStdoutFile, dvoStdoutName) = tempfile.mkstemp(prefix="dvopsps.stdout.", dir="/tmp")
@@ -197 +194 @@
                 tableName = rs.getString(1)
                 print "--- " + tableName
-                
+
                 continue
+
             dvopspsRunning = False
             if p.returncode < 0:
@@ -246 +244 @@
         cmd += " -D CATDIR " + self.skychunk.dvoLocation
 
-        self.dvopspsRunWithPoll(cmd, "dvoSkyTable", 2)
+        self.dvopspsRunWithPoll(cmd, "dvoSkyTable", 30)
 
         self.logger.infoPair("Adding index to", self.scratchDb.dvoSkyTable)

trunk/ippToPsps/jython/forcedobjectbatch.py

@@ -53 +53 @@
 
        try:
-           self.dvoForcedObjects = DvoForcedObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+           self.dvoForcedObjects = DvoForcedObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
        except:
            self.logger.errorPair("Unable to create instance of", "DvoForcedObjects")

trunk/ippToPsps/jython/insert.dvodb.info.py

@@ -46 +46 @@
         try:
             print "why doesn't this work"
-            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
         except:
             self.exitProgram("Unable to create instance of DvoObject")

trunk/ippToPsps/jython/objectbatch.py

@@ -53 +53 @@
 
        try:
-           self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+           self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
        except:
            self.logger.errorPair("Unable to create instance of", "DvoObjects")

trunk/ippToPsps/jython/queue.py

@@ -38 +38 @@
 
         try:
-            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
         except:
             self.exitProgram("Unable to create instance of DvoObject")

trunk/ippToPsps/jython/removepending.py

@@ -47 +47 @@
 
         try:
-            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
         except:
             self.exitProgram("Unable to create instance of DvoObject")