git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
While building bootstrapfs on fc6, I'm getting this
[nodemanager.git]
/
nm.py
diff --git
a/nm.py
b/nm.py
index
c7beebf
..
370c8df
100644
(file)
--- a/
nm.py
+++ b/
nm.py
@@
-1,5
+1,5
@@
#!/usr/bin/python
#!/usr/bin/python
-
+# Something relevant
"""Node Manager"""
import optparse
"""Node Manager"""
import optparse
@@
-15,7
+15,8
@@
import tools
from config import Config
from plcapi import PLCAPI
from config import Config
from plcapi import PLCAPI
-
+import random
+import net
savedargv = sys.argv[:]
savedargv = sys.argv[:]
@@
-30,14
+31,17
@@
parser.add_option('-p', '--period', action='store', dest='period', default=600,
modules = []
def GetSlivers(plc):
modules = []
def GetSlivers(plc):
- data = plc.GetSlivers()
- # net needs access to API for i2 nodes.
+ 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:
for module in modules:
- if module.__name__ == 'net':
- module.GetSlivers(plc, data)
- else:
+ try:
callback = getattr(module, 'GetSlivers')
callback(data)
callback = getattr(module, 'GetSlivers')
callback(data)
+ except: logger.log_exc()
def run():
try:
def run():
try:
@@
-55,7
+59,7
@@
def run():
print "Warning while writing PID file:", err
# Load and start modules
print "Warning while writing PID file:", err
# Load and start modules
- for module in ['
net', 'proper', 'conf_files', 'sm
']:
+ for module in ['
proper', 'conf_files', 'sm', 'bwmon
']:
try:
m = __import__(module)
m.start(options, config)
try:
m = __import__(module)
m.start(options, config)
@@
-73,9
+77,9
@@
def run():
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
while True:
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
while True:
- try: GetSlivers(plc)
-
except: logger.log_exc(
)
- time.sleep(options.period)
+ # Main NM Loop
+
GetSlivers(plc
)
+ time.sleep(options.period
+ random.randrange(0,301)
)
except: logger.log_exc()
except: logger.log_exc()