X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fscanapi.py;h=af7fcd430b4e3373eaf2647556012409a5bed4da;hb=cccbcf3069da9b6fe5e5817b5370bf1339bf42eb;hp=5928c5abf63ed8a62d8b86275ea73c95d9ab917a;hpb=035a846d8617889c01cae12bc6d64eb7c48b64bd;p=monitor.git

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index 5928c5a..af7fcd4 100644
--- a/monitor/scanapi.py
+++ b/monitor/scanapi.py
@@ -197,7 +197,6 @@ class ScanNodeInternal(ScanInterface):
 			try:
 				for port in [22, 806]: 
 					ssh = command.SSH('root', nodename, port)
-					#echo '  "fs_status":"'`touch /var/log/monitor 2>&1 ; if [ -d /vservers/ ] ; then touch /vservers/monitor.log 2>&1 ; fi ; grep proc /proc/mounts | grep ro,`'",'
 
 					(oval, errval) = ssh.run_noexcept2(""" <<\EOF
 						echo "{"
@@ -207,15 +206,17 @@ class ScanNodeInternal(ScanInterface):
 						echo '  "nm_status":"'`ps ax | grep nm.py | grep -v grep`'",'
 						echo '  "dns_status":"'`host boot.planet-lab.org 2>&1`'",'
 						echo '  "princeton_comon_dir":"'`ls -d /vservers/princeton_comon`'",'
+						echo '  "uptime":"'`uptime`'",'
 
 						ID=`grep princeton_comon /etc/passwd | awk -F : '{if ( $3 > 500 ) { print $3}}'` 
 						echo '  "princeton_comon_running":"'`ls -d /proc/virtual/$ID`'",'
 						echo '  "princeton_comon_procs":"'`vps ax | grep $ID | grep -v grep | wc -l`'",'
-						echo '  "rpm_version":"'`rpm -q NodeManager`'",'
-						echo '  "rpm_versions":"'`rpm -q -a`'",'
+						echo '  "fs_status":"'`grep proc /proc/mounts | grep ro, ; if [ -x /usr/bin/timeout.pl ] ; then timeout.pl 20 touch /var/log/monitor 2>&1 ; if [ -d /vservers/ ] ; then timeout.pl 20 touch /vservers/monitor.log 2>&1  ; fi ; fi`'",'
+						echo '  "rpm_version":"'`if [ -x /usr/bin/timeout.pl ] ; then timeout.pl 30 rpm -q NodeManager ; fi`'",'
+						echo '  "rpm_versions":"'`if [ -x /usr/bin/timeout.pl ] ; then timeout.pl 45 rpm -q -a ; fi`'",'
 						echo "}"
 EOF				""")
-					
+
 					values['ssh_error'] = errval
 					if len(oval) > 0:
 						#print "OVAL: %s" % oval
@@ -226,6 +227,7 @@ EOF				""")
 						values.update({'kernel_version': "", 'bmlog' : "", 'bootcd_version' : '', 
 										'nm_status' : '', 
 										'fs_status' : '',
+										'uptime' : '',
 										'dns_status' : '',
 										'rpm_version' : '',
 										'rpm_versions' : '',
@@ -240,6 +242,7 @@ EOF				""")
 			print "ALLVERSIONS: %s %s" % (nodename, values['rpm_versions'])
 
 			print "RPMVERSION: %s %s" % (nodename, values['rpm_version'])
+			print "UPTIME: %s %s" % (nodename, values['uptime'])
 			### RUN SSH ######################
 			b_getbootcd_id = True
 
@@ -340,16 +343,7 @@ EOF				""")
 										'memsize'  : 'null'}
 			# include output value
 			### GET PLC NODE ######################
-			plc_lock.acquire()
-			d_node = None
-			try:
-				d_node = plccache.GetNodeByName(nodename)
-				#d_node = plc.getNodes({'hostname': nodename}, ['pcu_ids', 'site_id', 
-				#						'date_created', 'last_updated', 
-				#						'last_contact', 'boot_state', 'nodegroup_ids'])[0]
-			except:
-				traceback.print_exc()
-			plc_lock.release()
+			d_node = plccache.GetNodeByName(nodename)
 			values['plc_node_stats'] = d_node
 
 			##### NMAP  ###################