X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fbootman.py;h=9fe28af0e28a3f3af897f42c356fe46d4f3643ae;hb=5c41a475f7d198274e46f2c5e6f033f06794288b;hp=36d8b353279e873c4f49da0182849f9931563d83;hpb=40588e1f900ba82db3ca69c5cc375805028f2430;p=monitor.git

diff --git a/monitor/bootman.py b/monitor/bootman.py
index 36d8b35..9fe28af 100755
--- a/monitor/bootman.py
+++ b/monitor/bootman.py
@@ -68,18 +68,34 @@ class NodeConnection:
 		return "unknown"
 
 	def get_dmesg(self):
+		t_stamp = time.strftime("%Y-%m-%d-%H:%M")
 		self.c.modules.os.system("dmesg > /var/log/dmesg.bm.log")
-		download(self.c, "/var/log/dmesg.bm.log", "log/dmesg.%s.log" % self.node)
-		log = open("log/dmesg.%s.log" % self.node, 'r')
+		download(self.c, "/var/log/dmesg.bm.log", "%s/history/%s-dmesg.%s.log" % (config.MONITOR_BOOTMANAGER_LOG, t_stamp, self.node))
+		os.system("cp %s/history/%s-dmesg.%s.log %s/dmesg.%s.log" % (config.MONITOR_BOOTMANAGER_LOG, t_stamp, self.node, config.MONITOR_BOOTMANAGER_LOG, self.node))
+		log = open("%s/dmesg.%s.log" % (config.MONITOR_BOOTMANAGER_LOG, self.node), 'r')
 		return log
 
 	def get_bootmanager_log(self):
-		download(self.c, "/tmp/bm.log", "log/bm.%s.log.gz" % self.node)
-		#os.system("zcat log/bm.%s.log.gz > log/bm.%s.log" % (self.node, self.node))
-		os.system("cp log/bm.%s.log.gz log/bm.%s.log" % (self.node, self.node))
-		log = open("log/bm.%s.log" % self.node, 'r')
+		t_stamp = time.strftime("%Y-%m-%d-%H:%M")
+		download(self.c, "/tmp/bm.log", "%s/history/%s-bm.%s.log" % (config.MONITOR_BOOTMANAGER_LOG, t_stamp, self.node))
+		os.system("cp %s/history/%s-bm.%s.log %s/bm.%s.log" % (config.MONITOR_BOOTMANAGER_LOG, t_stamp, self.node, config.MONITOR_BOOTMANAGER_LOG, self.node))
+		log = open("%s/bm.%s.log" % (config.MONITOR_BOOTMANAGER_LOG, self.node), 'r')
 		return log
 
+
+#	def get_dmesg(self):
+#		self.c.modules.os.system("dmesg > /var/log/dmesg.bm.log")
+#		download(self.c, "/var/log/dmesg.bm.log", "log/dmesg.%s.log" % self.node)
+#		log = open("log/dmesg.%s.log" % self.node, 'r')
+#		return log
+#
+#	def get_bootmanager_log(self):
+#		download(self.c, "/tmp/bm.log", "log/bm.%s.log.gz" % self.node)
+#		#os.system("zcat log/bm.%s.log.gz > log/bm.%s.log" % (self.node, self.node))
+#		os.system("cp log/bm.%s.log.gz log/bm.%s.log" % (self.node, self.node))
+#		log = open("log/bm.%s.log" % self.node, 'r')
+#		return log
+
 	def dump_plconf_file(self):
 		c = self.c
 		self.c.modules.sys.path.append("/tmp/source/")
@@ -627,8 +643,12 @@ class DebugInterface:
 
 		return sequence
 		
-
 def restore(sitehist, hostname, config=None, forced_action=None):
+	ret = restore_basic(sitehist, hostname, config, forced_action)
+	session.flush()
+	return ret
+
+def restore_basic(sitehist, hostname, config=None, forced_action=None):
 
 	# NOTE: Nothing works if the bootcd is REALLY old.
 	#       So, this is the first step.
@@ -643,23 +663,15 @@ def restore(sitehist, hostname, config=None, forced_action=None):
 			sitehist.sendMessage('newbootcd_notice', hostname=hostname)
 
 			print "\tDisabling %s due to out-of-date BootImage" % hostname
-			api.UpdateNode(hostname, {'boot_state' : 'disable'})
+			api.UpdateNode(hostname, {'boot_state' : 'disabled'})
 
 		# NOTE: nothing else is possible.
 		return True
 
 	debugnode = DebugInterface(hostname)
 	conn = debugnode.getConnection()
-	#print "conn: %s" % conn
-	#print "trying to use conn after returning it."
-	#print conn.c.modules.sys.path
-	#print conn.c.modules.os.path.exists('/tmp/source')
 	if type(conn) == type(False): return False
 
-	#if forced_action == "reboot":
-	#	conn.restart_node('reinstall')
-	#	return True
-
 	boot_state = conn.get_boot_state()
 	if boot_state != "debug":
 		print "... %s in %s state: skipping..." % (hostname , boot_state)
@@ -689,11 +701,11 @@ def restore(sitehist, hostname, config=None, forced_action=None):
 			print "...Should investigate.  Skipping node."
 			# TODO: send message related to these errors.
 
-			if not found_within(recent_actions, 'newbootcd_notice', 3):
+			if not found_within(recent_actions, 'baddisk_notice', 3):
 
 				log=conn.get_dmesg().read()
 				sitehist.sendMessage('baddisk_notice', hostname=hostname, log=log)
-				conn.set_nodestate('disable')
+				conn.set_nodestate('disabled')
 
 			return False
 
@@ -813,7 +825,7 @@ def restore(sitehist, hostname, config=None, forced_action=None):
 				args['log'] = conn.get_dmesg().read()
 
 				sitehist.sendMessage('baddisk_notice', **args)
-				conn.set_nodestate('disable')
+				conn.set_nodestate('disabled')
 
 		elif sequences[s] == "update_hardware_email":
 			if not found_within(recent_actions, 'minimalhardware_notice', 1):