X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=findbad.py;h=12b00805b02a18ee7b2a0f252552a467adfde851;hb=4c9eba6b66e93acca71aae2eacc18d00b38e88fa;hp=f01f31f425d700479011ee98a489751ecacbb1d7;hpb=9b8db783f3d465c4652b806395d5c0873b498cbd;p=monitor.git

diff --git a/findbad.py b/findbad.py
index f01f31f..12b0080 100755
--- a/findbad.py
+++ b/findbad.py
@@ -12,7 +12,7 @@ from monitor.util import file
 from pcucontrol.util import command
 from monitor import config
 
-from monitor.database.info.model import FindbadNodeRecordSync, FindbadNodeRecord, session
+from monitor.database.info.model import FindbadNodeRecord, session
 
 from monitor.sources import comon
 from monitor.wrapper import plc, plccache
@@ -53,9 +53,10 @@ def checkAndRecordState(l_nodes, cohash):
 
 	# CREATE all the work requests
 	for nodename in l_nodes:
-		fbnodesync = FindbadNodeRecordSync.findby_or_create(hostname=nodename, if_new_set={'round':0})
-		node_round   = fbnodesync.round
-		fbnodesync.flush()
+		#fbnodesync = FindbadNodeRecordSync.findby_or_create(hostname=nodename, if_new_set={'round':0})
+		#node_round   = fbnodesync.round
+		node_round = global_round - 1
+		#fbnodesync.flush()
 
 		if node_round < global_round or config.force:
 			# recreate node stats when refreshed
@@ -86,16 +87,16 @@ def checkAndRecordState(l_nodes, cohash):
 			print "All results collected."
 			break
 
-	print FindbadNodeRecordSync.query.count()
+	#print FindbadNodeRecordSync.query.count()
 	print FindbadNodeRecord.query.count()
 	session.flush()
 
 def main():
 	global global_round
 
-	fbsync = FindbadNodeRecordSync.findby_or_create(hostname="global", 
-													if_new_set={'round' : global_round})
-	global_round = fbsync.round
+	#fbsync = FindbadNodeRecordSync.findby_or_create(hostname="global", 
+	#												if_new_set={'round' : global_round})
+	#global_round = fbsync.round
 
 	if config.increment:
 		# update global round number to force refreshes across all nodes
@@ -145,8 +146,9 @@ def main():
 
 	if config.increment:
 		# update global round number to force refreshes across all nodes
-		fbsync.round = global_round
-		fbsync.flush()
+		#fbsync.round = global_round
+		#fbsync.flush()
+		pass
 
 	return 0