From: Jason Wang <jasowang@redhat.com>
To: autotest@test.kernel.org, lmr@redhat.com
Cc: kvm@vger.kernel.org
Subject: [PATCH 5/9] KVM test: Log the content from guest serial console
Date: Mon, 26 Apr 2010 18:04:02 +0800 [thread overview]
Message-ID: <20100426100402.26268.22330.stgit@localhost.localdomain> (raw)
In-Reply-To: <20100426095656.26268.50549.stgit@localhost.localdomain>
This patch tries to get the content of guest serial and log it into
the debug directoy of the testcase through a dedicated thread which is
created in the preprocessing and ended in the postprocessing. The
params of serial_mode must be set to "dump" in order to make use of
this feature.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
client/tests/kvm/kvm_preprocessing.py | 59 +++++++++++++++++++++++++++++++-
client/tests/kvm/tests_base.cfg.sample | 1 +
2 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py
index 4b9290c..50d0e35 100644
--- a/client/tests/kvm/kvm_preprocessing.py
+++ b/client/tests/kvm/kvm_preprocessing.py
@@ -1,4 +1,5 @@
import sys, os, time, commands, re, logging, signal, glob, threading, shutil
+import socket, select
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
import kvm_vm, kvm_utils, kvm_subprocess, ppm_utils
@@ -13,7 +14,8 @@ except ImportError:
_screendump_thread = None
_screendump_thread_termination_event = None
-
+_serialdump_thread = None
+_serialdump_thread_termination_event = None
def preprocess_image(test, params):
"""
@@ -267,6 +269,16 @@ def preprocess(test, params, env):
args=(test, params, env))
_screendump_thread.start()
+ # Start the serial dump thread
+ if params.get("serial_mode") == "dump":
+ logging.debug("Starting serialdump thread")
+ global _serialdump_thread, _serialdump_thread_termination_event
+ _serialdump_thread_termination_event = threading.Event()
+ _serialdump_thread = threading.Thread(target=_dump_serial_console,
+ args=(test, params, env))
+ _serialdump_thread.start()
+
+
def postprocess(test, params, env):
"""
@@ -286,6 +298,13 @@ def postprocess(test, params, env):
_screendump_thread_termination_event.set()
_screendump_thread.join(10)
+ # Terminate the serialdump thread
+ global _serialdump_thread, _serialdump_thread_termination_event
+ if _serialdump_thread:
+ logging.debug("Terminating serialdump thread...")
+ _serialdump_thread_termination_event.set()
+ _serialdump_thread.join(10)
+
# Warn about corrupt PPM files
for f in glob.glob(os.path.join(test.debugdir, "*.ppm")):
if not ppm_utils.image_verify_ppm_file(f):
@@ -450,3 +469,41 @@ def _take_screendumps(test, params, env):
if _screendump_thread_termination_event.isSet():
break
_screendump_thread_termination_event.wait(delay)
+
+def _dump_serial_console(test, params, env):
+ global _serialdump_thread_termination_event
+ rs = []
+ files = {}
+
+ while True:
+ for vm in kvm_utils.env_get_all_vms(env):
+ if not files.has_key(vm):
+ try:
+ serial_socket = socket.socket(socket.AF_UNIX,
+ socket.SOCK_STREAM)
+ serial_socket.setblocking(False)
+ serial_socket.connect(vm.serial_file_name)
+ except:
+ logging.debug("Could not connect to serial socket for %s" %
+ vm.name)
+ continue
+ rs.append(serial_socket)
+ serial_dump_filename = os.path.join(test.debugdir,
+ "serial-%s" % vm.name)
+ files[vm] = [serial_socket, file(serial_dump_filename, "a+")]
+
+ r, w, x = select.select(rs, [], [], 0.5)
+ for vm in files.keys():
+ [s ,d] = files[vm]
+ if s in r:
+ data = s.recv(16384)
+ if len(data) == 0:
+ rs.remove(s)
+ files.pop(vm)
+ else:
+ d.write(data)
+
+ if _serialdump_thread_termination_event.isSet():
+ break
+
+
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 9f82ffb..169a69e 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -13,6 +13,7 @@ start_vm = yes
kill_vm = no
kill_vm_gracefully = yes
kill_unresponsive_vms = yes
+serial_mode = dump
# Screendump specific stuff
convert_ppm_files_to_png_on_error = yes
next prev parent reply other threads:[~2010-04-26 10:04 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-26 10:03 [PATCH 0/9] Make use of the redirection of guest serial Jason Wang
2010-04-26 10:03 ` [PATCH 1/9] KVM test: Introduce the prompt assist Jason Wang
2010-04-28 11:28 ` Michael Goldish
2010-05-06 2:55 ` Jason Wang
2010-05-06 15:18 ` Lucas Meneghel Rodrigues
2010-04-26 10:03 ` [PATCH 2/9] KVM test: Add the ability to send the username in remote_login() Jason Wang
2010-04-28 11:32 ` Michael Goldish
2010-04-26 10:03 ` [PATCH 3/9] KVM test: Make the login re suitable for serial console Jason Wang
2010-04-28 11:18 ` Michael Goldish
2010-05-06 2:57 ` Jason Wang
2010-04-26 10:03 ` [PATCH 4/9] KVM test: Redirect the serial to the unix domain socket Jason Wang
2010-04-26 10:04 ` Jason Wang [this message]
2010-04-28 13:26 ` [PATCH 5/9] KVM test: Log the content from guest serial console Michael Goldish
2010-05-06 3:03 ` Jason Wang
2010-04-26 10:04 ` [PATCH 6/9] KVM test: Raise error when met unknown type in kvm_vm.remote_login() Jason Wang
2010-05-06 15:15 ` [Autotest] " Lucas Meneghel Rodrigues
2010-04-26 10:04 ` [PATCH 7/9] KVM test: Introduce the local_login() Jason Wang
2010-04-28 12:01 ` Michael Goldish
2010-04-28 23:44 ` Amos Kong
[not found] ` <20100428234409.GA2738@akong@redhat.com>
2010-05-05 9:37 ` [Autotest] " Michael Goldish
2010-05-06 3:07 ` Jason Wang
2010-04-26 10:04 ` [PATCH 8/9] KVM test: Create the background threads before calling process() Jason Wang
2010-04-28 11:55 ` Michael Goldish
2010-05-06 15:35 ` [Autotest] " Lucas Meneghel Rodrigues
2010-04-26 10:04 ` [PATCH 9/9] KVM test: Redirect the console to serial for all linux guests Jason Wang
2010-04-28 12:24 ` Michael Goldish
2010-05-06 3:08 ` Jason Wang
2010-05-06 15:43 ` Lucas Meneghel Rodrigues
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100426100402.26268.22330.stgit@localhost.localdomain \
--to=jasowang@redhat.com \
--cc=autotest@test.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=lmr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.