X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=8ad5e65b1b8034ee3345bfde4a242d113536f7a5;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=dbf1934dde80c06a26679477e53e8dfa538016af;hpb=07d0a9513a54dde9917ff0ea472b0d69b97e132d;p=nodemanager.git

diff --git a/nm.py b/nm.py
index dbf1934..8ad5e65 100644
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+# $Id: nm.py,v 1.15.2.8 2007/09/04 20:50:30 faiyaza Exp $
+
 """Node Manager"""
 
 import optparse
@@ -7,40 +9,48 @@ import time
 import xmlrpclib
 import socket
 import os
+import sys
+import resource
 
 import logger
 import tools
 
 from config import Config
-from plcapi import PLCAPI
+from plcapi import PLCAPI 
+import random
+import net
+
+savedargv = sys.argv[:]
 
 parser = optparse.OptionParser()
 parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
 parser.add_option('-s', '--startup', action='store_true', dest='startup', default=False, help='run all sliver startup scripts')
 parser.add_option('-f', '--config', action='store', dest='config', default='/etc/planetlab/plc_config', help='PLC configuration file')
 parser.add_option('-k', '--session', action='store', dest='session', default='/etc/planetlab/session', help='API session key (or file)')
+parser.add_option('-p', '--period', action='store', dest='period', default=600, help='Polling interval (sec)')
 (options, args) = parser.parse_args()
 
-# XXX - awaiting a real implementation
-data = []
 modules = []
 
 def GetSlivers(plc):
-    # XXX Set a socket timeout, maybe in plcapi.PLCAPI
-    # socket.setdefaulttimeout(timeout)
-    data = plc.GetSlivers()
-
-    for mod in modules: mod.GetSlivers_callback(data)
-
-def start_and_register_callback(mod):
-    mod.start(options)
-    modules.append(mod)
-
+    try: data = plc.GetSlivers()
+    except: logger.log_exc()
+    # Set i2 ip list for nodes in I2 nodegroup.
+    try: net.GetSlivers(plc, data)
+    except: logger.log_exc()
+    #  All other callback modules
+    for module in modules:
+        try:        
+            callback = getattr(module, 'GetSlivers')
+            callback(data)
+        except: logger.log_exc()
 
 def run():
     try:
         if options.daemon: tools.daemon()
 
+        # Load /etc/planetlab/plc_config
+        config = Config(options.config)
 
         try:
             other_pid = tools.pid_file()
@@ -50,16 +60,14 @@ def run():
         except OSError, err:
             print "Warning while writing PID file:", err
 
-        try:
-            import sm
-            start_and_register_callback(sm)
-            import conf_files
-            start_and_register_callback(conf_files)
-        except ImportError, err:
-            print "Warning while registering callbacks:", err
-
-        # Load /etc/planetlab/plc_config
-        config = Config(options.config)
+        # Load and start modules
+        for module in ['proper', 'conf_files', 'sm', 'bwmon']:
+            try:
+                m = __import__(module)
+                m.start(options, config)
+                modules.append(m)
+            except ImportError, err:
+                print "Warning while loading module %s:" % module, err
 
         # Load /etc/planetlab/session
         if os.path.exists(options.session):
@@ -68,16 +76,24 @@ def run():
             session = options.session
 
         # Initialize XML-RPC client
-        plc = PLCAPI(config.plc_api_uri, session)
+        plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
 
         while True:
-            try: GetSlivers(plc)
-            except: logger.log_exc()
-            time.sleep(600)
+        # Main NM Loop
+            GetSlivers(plc)
+            time.sleep(options.period + random.randrange(0,301))
     except: logger.log_exc()
 
 
-if __name__ == '__main__': run()
+if __name__ == '__main__':
+    stacklim = 512*1024  # 0.5 MiB
+    curlim = resource.getrlimit(resource.RLIMIT_STACK)[0]  # soft limit
+    if curlim > stacklim:
+        resource.setrlimit(resource.RLIMIT_STACK, (stacklim, stacklim))
+        # for some reason, doesn't take effect properly without the exec()
+        python = '/usr/bin/python'
+        os.execv(python, [python] + savedargv)
+    run()
 else:
     # This is for debugging purposes.  Open a copy of Python and import nm
     tools.as_daemon_thread(run)