Changeset 10035 in genesis for tools

Timestamp:

Mar 6, 2012, 1:17:56 PM (13 years ago)

Author:

rick

Message:

MultiManager dict is buggy.

File:

• tools/get-link-traffic.py (modified) (8 diffs)

tools/get-link-traffic.py

@@ -2 +2 @@
 #
 # XXX: Parsing snmpwalk is soo wrong todo, use a proper python library.
+#
 #
 # Rick van der Zwet <info@rickvanderzwet.nl>
@@ -59 +60 @@
   return None
 
-    
-
 try:
   ff = sys.argv[1]
@@ -66 +65 @@
   ff = ''
 
-def process_file(logger, store, nf, rescan):
+def process_file(logger, m_snmp, m_traffic, m_uptime, nf, rescan):
   data = yaml.load(open(nf,'r'))
   nodename = data['nodename']
 
-  if store['snmp'].has_key(nodename):
-    ip = store['snmp'][nodename]
+  if m_snmp.has_key(nodename):
+    ip = m_snmp[nodename]
     if not ip and rescan:
       logger.info("Re-scanning for new valid IP")
       ip = find_right_snmp_ip(logger, data)
-      store['snmp'][nodename] = ip
+      m_snmp[nodename] = ip
     else:
       try:
@@ -82 +81 @@
         logger.info("Re-scanning for new valid IP")
         ip = find_right_snmp_ip(logger, data)
-        store['snmp'][nodename] = ip
-      
+        m_snmp[nodename] = ip
   else:
     logger.info("Running discovery for %s", nodename)
     ip = find_right_snmp_ip(logger, data)
-    store['snmp'][nodename] = ip
+    m_snmp[nodename] = ip
 
   if ip == None:
     logger.error("No valid ip found for node %s", nodename)
     return
-  
+
   logger.info("Processing %s via %s", nodename, ip)
   target = 'IF-MIB::ifDescr'
-  
+
   try:
     iface = get_snmp_stats(logger, ip, 'IF-MIB::ifDescr')
@@ -102 +100 @@
 
     uptime = get_snmp_value(logger, ip, 'DISMAN-EVENT-MIB::sysUpTimeInstance')
-    store['uptime'][nodename] = int(uptime)
-    
+    m_uptime[nodename] = int(uptime)
+
     traffic = {}
     for i,f in iface.iteritems():
       traffic[f] = (int(ifin[i]), int(ifout[i]))
-    store['traffic'][nodename] = traffic 
+    m_traffic[nodename] = traffic
   except ConnectError:
     logger.error("Unable to get all data")
     pass
 
-def worker(i, input, m_store):
+def worker(i, input, m_snmp, m_traffic, m_uptime):
   logger = logging.getLogger('Worker%s' % i)
   logger.info("Worker")
   for (nf, rescan) in iter(input.get, 'STOP'):
-    process_file(logger, m_store, nf, rescan)
+    process_file(logger, m_snmp, m_traffic, m_uptime, nf, rescan)
   logger.info("END")
 
@@ -129 +127 @@
     store = { 'snmp' : {}, 'traffic' : {}, 'uptime' : {}}
     pass
-  m_store = manager.dict(store)
+  # XXX: Manager.dict has bug of handling dicts inside dicts, using awefull quick
+  # XXX: http://bugs.python.org/issue6766
+  m_snmp = manager.dict(store['snmp'])
+  m_traffic = manager.dict(store['traffic'])
+  m_uptime = manager.dict(store['uptime'])
 
   NUMBER_OF_PROCESSES = 10
@@ -135 +137 @@
   plist = {}
   for i in range(NUMBER_OF_PROCESSES):
-    plist[i] = Process(target=worker, args=(i, task_queue,m_store))
+    plist[i] = Process(target=worker, args=(i, task_queue,m_snmp,m_traffic,m_uptime))
     plist[i].start()
 
   for nf in sorted(glob.glob('nodes/*%s*/wleiden.yaml' % ff)):
     task_queue.put((nf, RESCAN))
- 
+
   for i in range(NUMBER_OF_PROCESSES):
     task_queue.put('STOP')
@@ -147 +149 @@
     plist[i].join()
 
-
+  store = {'snmp' : dict(m_snmp), 'traffic' : dict(m_traffic), 'uptime' : dict(m_uptime)}
   yaml.dump(store,open(DATASTORE,'w'))