+ new XMLRPC_SERVER name to boot.planet-lab.org

diff --git a/comon.py b/comon.py
index 58e49e7..25c8a51 100755 (executable)
--- a/comon.py
+++ b/comon.py
@@ -3,7 +3,7 @@
 #
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu>
 #
-# $Id: comon.py,v 1.5 2007/05/16 01:53:46 faiyaza Exp $
+# $Id: comon.py,v 1.6 2007/06/29 12:42:22 soltesz Exp $
 #
 # Get CoMon data, unsorted, in CSV, and create a huge hash.
 #
@@ -64,7 +64,8 @@ class Comon(Thread):
                        #"clock_drift": "drift > 1m",
                        #"dns": "dns1udp>80 && dns2udp>80",
                        #"filerw": "filerw > 0",
-                       "dbg" : "keyok==0"
+                       #"all" : ""
+                       "dbg" : "keyok==0",
                        }
                Thread.__init__(self)
 

diff --git a/config.py b/config.py
index c090b35..c9613ff 100644 (file)
--- a/config.py
+++ b/config.py
@@ -5,6 +5,8 @@ import getopt
 import sys
 import __main__
 
+XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/"
+
 class config:
        debug = True
        mail = False

diff --git a/monitor.py b/monitor.py
index f24caef..3af44ee 100644 (file)
--- a/monitor.py
+++ b/monitor.py
@@ -5,7 +5,7 @@
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu>
 # Stephen Soltesz <soltesz@cs.princeton.edu>
 #
-# $Id: monitor.py,v 1.5 2007/05/16 01:53:46 faiyaza Exp $
+# $Id: monitor.py,v 1.6 2007/06/29 12:42:22 soltesz Exp $
 
 import sys
 import os
@@ -114,6 +114,18 @@ class Dummy(Thread):
        def run(self):
                time.sleep(5)
 
+def preComon(l_nodes, toCheck):
+       for host in l_nodes:
+               diag_node = {}
+               diag_node['nodename'] = host
+               diag_node['message'] = None
+               diag_node['bucket'] = ["dbg"]
+               diag_node['stage'] = ""
+               diag_node['args'] = None
+               diag_node['info'] = None
+               diag_node['time'] = time.time()
+               toCheck.put(diag_node)
+       return 
 
 def dict_from_nodelist(nl):
        d = {}
@@ -159,13 +171,16 @@ def main():
                l_nodes = []
                print "Getting node info for hosts in: %s" % file
                for nodename in nodelist:
+                       if config.debug: print ".", ; sys.stdout.flush()
                        l_nodes += plc.getNodes({'hostname': nodename})
+               print ""
        else:
                # Authoritative list of nodes from PLC
                l_nodes = soltesz.if_cached_else(config.cachenodes, "l_nodes", plc.getNodes)
 
        # Minus blacklisted ones..
        l_blacklist = soltesz.if_cached_else(1, "l_blacklist", lambda : [])
+       l_ticket_blacklist = soltesz.if_cached_else(1,"l_ticket_blacklist",lambda : [])
        l_wl_nodes  = filter(lambda x : not x['hostname'] in l_blacklist, l_nodes)
        # A handy dict of hostname-to-nodestruct mapping
        d_allplc_nodes = dict_from_nodelist(l_wl_nodes)
@@ -175,13 +190,22 @@ def main():
        ad_dbTickets = soltesz.if_cached_else(config.cachert, "ad_dbTickets", rt.rt_tickets)
        print "Getting tickets from RT took: %f sec" % t.diff() ; del t
 
+       if os.path.isfile("precomon.txt"): 
+               nodelist = config.getListFromFile("precomon.txt")
+               print "PreComon node info"
+               preComon(nodelist, toCheck)
+               for nodename in nodelist:
+                       # TODO: temporary hack.
+                       if nodename not in d_allplc_nodes:
+                               d_allplc_nodes[nodename] = {}
+
        # TODO: Refreshes Comon data every COSLEEP seconds
        cm1 = comon.Comon(cdb, d_allplc_nodes, toCheck)
        startThread(cm1,"comon")
 
        # TODO: make queues event based, not node based. 
        # From the RT db, add hosts to q(toCheck) for filtering the comon nodes.
-       rt1 = rt.RT(ad_dbTickets, tickets, toCheck, sickNoTicket)
+       rt1 = rt.RT(ad_dbTickets, tickets, toCheck, sickNoTicket, l_ticket_blacklist)
        #       Kind of a hack. Cleans the DB for stale entries and updates db.
        #   (UNTESTED)
        #       rt5 = rt.RT(ad_dbTickets, tickets, toCheck, sickNoTicket)

diff --git a/plc.py b/plc.py
index cb56ff4..ff5efd3 100644 (file)
--- a/plc.py
+++ b/plc.py
@@ -5,7 +5,7 @@
 # 
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu
 #
-# $Id: plc.py,v 1.14 2007/04/06 16:16:54 faiyaza Exp $
+# $Id: plc.py,v 1.15 2007/06/29 12:42:22 soltesz Exp $
 #
 
 from emailTxt import *
@@ -13,13 +13,13 @@ import xml, xmlrpclib
 import logging
 import auth
 import time
-from config import config
-
-config = config()
+from config import config,XMLRPC_SERVER
 
 logger = logging.getLogger("monitor")
 
-XMLRPC_SERVER = 'https://www.planet-lab.org/PLCAPI/'
+#XMLRPC_SERVER = config.XMLRPC_SERVER
+
+config = config()
 
 '''
 Returns list of nodes in dbg as reported by PLC