X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=findbadpcu.py;h=8ebd8914806cd965cde1228b04f845a4d92a579f;hb=8e65cdcaaf08982f5f744297c009359ec74d31b5;hp=83456371c8b2dc7959399fcb7e17b49a13736ce8;hpb=da62714c855a89f1b50d21844fa8f1e709850ebb;p=monitor.git

diff --git a/findbadpcu.py b/findbadpcu.py
index 8345637..8ebd891 100755
--- a/findbadpcu.py
+++ b/findbadpcu.py
@@ -13,10 +13,10 @@ import threadpool
 import threading
 
 import monitor
-from monitor.pcu import reboot
+from pcucontrol  import reboot
 from monitor import config
-from monitor.database.infovacuum import FindbadPCURecordSync, FindbadPCURecord
-from monitor.database.dborm import mon_session as session
+from monitor.database.info.model import FindbadPCURecordSync, FindbadPCURecord, session
+from monitor import database
 from monitor import util 
 from monitor.wrapper import plc, plccache
 from nodequery import pcu_select
@@ -275,7 +275,7 @@ def recordPingAndSSH(request, result):
 
 		fbrec = FindbadPCURecord(
 					date_checked=datetime.fromtimestamp(values['date_checked']),
-					record=fbsync.round,
+					round=fbsync.round,
 					plc_pcuid=pcu_id,
 					plc_pcu_stats=values['plc_pcu_stats'],
 					dns_status=values['dnsmatch'],
@@ -284,6 +284,11 @@ def recordPingAndSSH(request, result):
 					reboot_trial_status="%s" % values['reboot'],
 				)
 		fbnodesync.round = global_round
+
+		fbnodesync.flush()
+		fbsync.flush()
+		fbrec.flush()
+
 		count += 1
 		print "%d %s %s" % (count, nodename, values)
 
@@ -309,9 +314,10 @@ def checkAndRecordState(l_pcus, cohash):
 	for pcuname in l_pcus:
 		pcu_id = int(pcuname)
 		fbnodesync = FindbadPCURecordSync.findby_or_create(plc_pcuid=pcu_id, if_new_set={'round' : 0})
+		fbnodesync.flush()
 
 		node_round   = fbnodesync.round
-		if node_round < global_round:
+		if node_round < global_round or config.force:
 			# recreate node stats when refreshed
 			#print "%s" % nodename
 			req = threadpool.WorkRequest(collectPingAndSSH, [pcuname, cohash], {}, 
@@ -360,6 +366,8 @@ def main():
 		global_round += 1
 		fbsync.round = global_round
 
+	fbsync.flush()
+
 	if config.site is not None:
 		api = plc.getAuthAPI()
 		site = api.GetSites(config.site)
@@ -408,6 +416,7 @@ if __name__ == '__main__':
 						dbname="findbadpcus", 
 						cachenodes=False,
 						refresh=False,
+						force=False,
 						)
 	parser.add_option("-f", "--nodelist", dest="nodelist", metavar="FILE", 
 						help="Provide the input file for the node list")
@@ -426,6 +435,8 @@ if __name__ == '__main__':
 						help="Refresh the cached values")
 	parser.add_option("-i", "--increment", action="store_true", dest="increment", 
 						help="Increment round number to force refresh or retry")
+	parser.add_option("", "--force", action="store_true", dest="force", 
+						help="Force probe without incrementing global 'round'.")
 	parser = parsermodule.getParser(['defaults'], parser)
 	config = parsermodule.parse_args(parser)
 	try: