X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=c4760fcc6ec848a7c7c37981120ce6a6b97254a5;hb=c50b76ac34dc007a5f63ae8ff72bc6d2aa7d2166;hp=1e5559d1f213058dcece3439fc7034de04b7d4b1;hpb=be193a6a83281b91afb18ab6b26eb6ea4eea840c;p=nodemanager.git

diff --git a/nm.py b/nm.py
index 1e5559d..c4760fc 100644
--- a/nm.py
+++ b/nm.py
@@ -1,57 +1,93 @@
+#!/usr/bin/python
+
 """Node Manager"""
 
 import optparse
 import time
 import xmlrpclib
+import socket
+import os
+import sys
+import resource
 
-import accounts
-import api
-import database
-import delegate
 import logger
-import sliver_vs
 import tools
 
+from config import Config
+from plcapi import PLCAPI 
+
+
+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():
-    for mod in modules: mod.GetSlivers_callback(data)
-
-def start_and_register_callback(mod):
-    mod.start()
-    modules.append(mod)
-
+def GetSlivers(plc):
+    data = plc.GetSlivers()
+    # net needs access to API for i2 nodes.
+    for module in modules:
+        if module.__name__ == 'net':
+            module.GetSlivers(plc, data)
+        else:
+            callback = getattr(module, 'GetSlivers')
+            callback(data)
 
 def run():
     try:
         if options.daemon: tools.daemon()
 
-        accounts.register_class(sliver_vs.Sliver_VS)
-        accounts.register_class(delegate.Delegate)
+        # Load /etc/planetlab/plc_config
+        config = Config(options.config)
+
+        try:
+            other_pid = tools.pid_file()
+            if other_pid != None:
+                print """There might be another instance of the node manager running as pid %d.  If this is not the case, please remove the pid file %s""" % (other_pid, tools.PID_FILE)
+                return
+        except OSError, err:
+            print "Warning while writing PID file:", err
+
+        # Load and start modules
+        for module in ['net', '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):
+            session = file(options.session).read().strip()
+        else:
+            session = options.session
 
-        other_pid = tools.pid_file()
-        if other_pid != None:
-            print """There might be another instance of the node manager running as pid %d.  If this is not the case, please remove the pid file %s""" % (other_pid, tools.PID_FILE)
-            return
+        # Initialize XML-RPC client
+        plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
 
-        start_and_register_callback(database)
-        api.start()
         while True:
-            try: GetSlivers()
+            try: GetSlivers(plc)
             except: logger.log_exc()
-            time.sleep(10)
+            time.sleep(options.period)
     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)