Refactor all the sysinfo collection code into something a bit less
ad-hoc than the original code. In particular:
- move all the code into base_sysinfo and site_sysinfo classes, and
use inheritance to hook the site-specific code rather that having
to add explicit hooks to the base code
- get rid of all the magic state created in client/bin/test.py so
that we can pass data between the sysinfo code run before and
after each test; instead, just have a single sysinfo instance
associated with a job and store state there
- change all the code to work with paths taken from job and test
objects (i.e. job.resultdir and test.outputdir) instead of just
magically changing the working directory and implicitly doing all
logging in place
- change the reboot in the job sysinfo dir to call them boot.0,
boot.1, etc. to be more in line with the names we use in TKO
- replace some code that used shell commands with functions from
the python standard library (e.g. os.symlink instead of "ln -s")
Risk: Medium
Visibility: reboot.N -> boot.(N-1) in sysinfo; all other changes
should not be user visible
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2257 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/sysinfo.py b/client/bin/sysinfo.py
index 5530f27..7efd1a0 100755
--- a/client/bin/sysinfo.py
+++ b/client/bin/sysinfo.py
@@ -1,164 +1,11 @@
-#!/usr/bin/python
-
-import common
-
-import os, shutil, re, glob
-from autotest_lib.client.common_lib import utils
-
+from autotest_lib.client.bin import base_sysinfo
try:
from autotest_lib.client.bin import site_sysinfo
- local = True
except ImportError:
- local = False
-
-# stuff to log per reboot
-files = ['/proc/pci', '/proc/meminfo', '/proc/slabinfo', '/proc/version',
- '/proc/cpuinfo', '/proc/cmdline', '/proc/modules', '/proc/interrupts']
-# commands = ['lshw'] # this causes problems triggering CDROM drives
-commands = ['uname -a', 'lspci -vvn', 'gcc --version', 'ld --version',
- 'mount', 'hostname']
-path = ['/usr/bin', '/bin']
-
-
-def run_command(command, output):
- parts = command.split(None, 1)
- cmd = parts[0]
- if len(parts) > 1:
- args = parts[1]
- else:
- args = ''
- for dir in path:
- pathname = dir + '/' + cmd
- if not os.path.exists(pathname):
- continue
- tmp_cmd = "%s %s > %s 2> /dev/null" % (pathname, args, output)
- utils.system(tmp_cmd)
-
-
-def reboot_count():
- if not glob.glob('*'):
- return -1 # No reboots, initial data not logged
- else:
- return len(glob.glob('reboot*'))
-
-
-def boot_subdir(reboot_count):
- """subdir of job sysinfo"""
- if reboot_count == 0:
- return '.'
- else:
- return 'reboot%d' % reboot_count
-
-
-def log_per_reboot_data(sysinfo_dir):
- """we log this data when the job starts, and again after any reboot"""
- pwd = os.getcwd()
- try:
- os.chdir(sysinfo_dir)
- subdir = boot_subdir(reboot_count() + 1)
- if not os.path.exists(subdir):
- os.mkdir(subdir)
- os.chdir(os.path.join(sysinfo_dir, subdir))
- _log_per_reboot_data()
- finally:
- os.chdir(pwd)
-
-
-def _log_per_reboot_data():
- """system info to log before each step of the job"""
- for command in commands:
- run_command(command, re.sub(r'\s', '_', command))
-
- for file in files:
- if (os.path.exists(file)):
- shutil.copyfile(file, os.path.basename(file))
-
- utils.system('dmesg -c > dmesg', ignore_status=True)
- utils.system('df -mP > df', ignore_status=True)
- if local:
- site_sysinfo.log_per_reboot_data()
-
-
-def log_before_each_test(state_dict, job_sysinfo_dir, test_sysinfo_dir):
- if os.path.exists("/var/log/messages"):
- stat = os.stat("/var/log/messages")
- state_dict["messages_size"] = stat.st_size
- state_dict["messages_inode"] = stat.st_ino
-
-
-def _log_messages(state_dict):
- """ Log all of the new data in /var/log/messages. """
- try:
- # log all of the new data in /var/log/messages
- bytes_to_skip = 0
- if "messages_size" in state_dict and "messages_inode" in state_dict:
- current_inode = os.stat("/var/log/messages").st_ino
- if current_inode == state_dict["messages_inode"]:
- bytes_to_skip = state_dict["messages_size"]
- in_messages = open("/var/log/messages")
- in_messages.seek(bytes_to_skip)
- out_messages = open("messages", "w")
- out_messages.write(in_messages.read())
- in_messages.close()
- out_messages.close()
- except Exception, e:
- print "/var/log/messages collection failed with %s" % e
-
-
-def log_after_each_test(state_dict, job_sysinfo_dir, test_sysinfo_dir):
- """log things that change after each test (called from test.py)"""
- pwd = os.getcwd()
- try:
- os.chdir(job_sysinfo_dir)
- reboot_subdir = boot_subdir(reboot_count())
- reboot_dir = os.path.join(job_sysinfo_dir, reboot_subdir)
- assert os.path.exists(reboot_dir)
-
- os.makedirs(test_sysinfo_dir)
- os.chdir(test_sysinfo_dir)
- utils.system('ln -s %s reboot_current' % reboot_dir)
-
- utils.system('dmesg -c > dmesg', ignore_status=True)
- utils.system('df -mP > df', ignore_status=True)
-
- _log_messages(state_dict)
-
- if local:
- site_sysinfo.log_after_each_test()
- finally:
- os.chdir(pwd)
-
-
-def log_test_keyvals(test, test_sysinfo_dir):
- """
- Extract some useful data from the sysinfo and write it out into
- the test keyval.
- """
- keyval = {}
-
- # grab a bunch of single line files and turn them into keyvals
- files_to_log = ["cmdline", "uname_-a"]
- keyval_fields = ["cmdline", "uname"]
- for filename, field in zip(files_to_log, keyval_fields):
- path = os.path.join(test_sysinfo_dir, "reboot_current", filename)
- if os.path.exists(path):
- keyval["sysinfo-%s" % field] = utils.read_one_line(path)
-
- # grab the total memory
- path = os.path.join(test_sysinfo_dir, "reboot_current", "meminfo")
- if os.path.exists(path):
- mem_data = open(path).read()
- match = re.search(r"^MemTotal:\s+(\d+) kB$", mem_data, re.MULTILINE)
- if match:
- keyval["sysinfo-memtotal-in-kb"] = match.group(1)
-
- # write out the data to the test keyval file
- test.write_test_keyval(keyval)
-
- # call the site-specific version of this function
- if local:
- site_sysinfo.log_test_keyvals(test, test_sysinfo_dir)
-
-
-if __name__ == '__main__':
- log_per_reboot_data()
+ # no site_sysinfo, just make a class using the base version
+ class sysinfo(base_sysinfo.base_sysinfo):
+ pass
+else:
+ # otherwise, use the site version (should inherit from the base)
+ class sysinfo(site_sysinfo.site_sysinfo):
+ pass