shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

tests: kernel message for <3.5 kernels

Browse Source 
Since /dev/kmsg is useless on kernel <3.5 user there automatically
syslog to obtain traces from kernel log buffer during test.
This commit is contained in:
Zdenek Kabelac 2016-09-20 17:09:46 +02:00
parent 67d4b3b7f2
commit a9c2a62939
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
test/lib/brick-shelltest.h
View File

@ -75,6 +75,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/klog.h> #include <sys/klog.h>
#include <sys/utsname.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -484,8 +485,12 @@ struct FileSink : FdSink {
} }
}; };
#define BRICK_SYSLOG_ACTION_READ 2
#define BRICK_SYSLOG_ACTION_READ_ALL 3
#define BRICK_SYSLOG_ACTION_READ_CLEAR 4 #define BRICK_SYSLOG_ACTION_READ_CLEAR 4
#define BRICK_SYSLOG_ACTION_CLEAR 5 #define BRICK_SYSLOG_ACTION_CLEAR 5
#define BRICK_SYSLOG_ACTION_SIZE_UNREAD 9
#define BRICK_SYSLOG_ACTION_SIZE_BUFFER 10
struct Source { struct Source {
int fd; int fd;
@ -553,10 +558,24 @@ struct FileSource : Source {
struct KMsg : Source { struct KMsg : Source {
bool can_clear; bool can_clear;
bool syslog;
ssize_t buffer_size;
KMsg() : can_clear( strcmp(getenv("LVM_TEST_CAN_CLOBBER_DMESG") ? : "0", "0") ) { KMsg() : can_clear( strcmp(getenv("LVM_TEST_CAN_CLOBBER_DMESG") ? : "0", "0") ),
buffer_size(128 * 1024)
{
#ifdef __unix #ifdef __unix
if ( (fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK)) < 0 ) { struct utsname uts;
unsigned kmaj, kmin, krel;
// Can't use kmsg on kernels pre 3.5, relay on syslog for that case
syslog = ( ( ::uname(&uts) == 0 ) &&
( ::sscanf( uts.release, "%u.%u.%u", &kmaj, &kmin, &krel ) == 3 ) &&
( ( kmaj < 3 ) || ( ( kmaj == 3 ) && ( kmin < 5 ) ) ) );
if ( syslog )
buffer_size = klogctl( BRICK_SYSLOG_ACTION_SIZE_BUFFER, NULL, 0 );
else if ( (fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK)) < 0 ) {
if (errno != ENOENT) /* Older kernels (<3.5) do not support /dev/kmsg */ if (errno != ENOENT) /* Older kernels (<3.5) do not support /dev/kmsg */
perror("opening /dev/kmsg"); perror("opening /dev/kmsg");
if ( klogctl( BRICK_SYSLOG_ACTION_CLEAR, 0, 0 ) < 0 ) if ( klogctl( BRICK_SYSLOG_ACTION_CLEAR, 0, 0 ) < 0 )
@ -573,14 +592,18 @@ struct KMsg : Source {
void sync( Sink *s ) { void sync( Sink *s ) {
#ifdef __unix #ifdef __unix
ssize_t sz; ssize_t sz;
char buf[ 128 * 1024 ]; char buf[ buffer_size ];
if ( dev_kmsg() ) { if ( syslog ) {
while ( (sz = ::read(fd, buf, sizeof(buf) - 1)) > 0 ) while ( klogctl(BRICK_SYSLOG_ACTION_SIZE_UNREAD, NULL, 0 ) > 0 &&
( sz = klogctl( BRICK_SYSLOG_ACTION_READ, buf, ( int ) buffer_size ) ) > 0 )
s->push( std::string( buf, sz ) );
} else if ( dev_kmsg() ) {
while ( (sz = ::read(fd, buf, buffer_size)) > 0 )
s->push( std::string( buf, sz ) ); s->push( std::string( buf, sz ) );
} else if ( can_clear ) { } else if ( can_clear ) {
while ( ( sz = klogctl( BRICK_SYSLOG_ACTION_READ_CLEAR, buf, while ( ( sz = klogctl( BRICK_SYSLOG_ACTION_READ_CLEAR, buf,
sizeof(buf) - 1 )) > 0 ) ( int) buffer_size ) ) > 0 )
s->push( std::string( buf, sz ) ); s->push( std::string( buf, sz ) );
if ( sz < 0 && errno == EPERM ) if ( sz < 0 && errno == EPERM )
can_clear = false; can_clear = false;

1
test/lib/utils.sh
View File

@ -219,6 +219,7 @@ dm_table() {
} }
skip() { skip() {
set +vx # debug off
if test "$#" -eq 0; then if test "$#" -eq 0; then
stacktrace stacktrace
else else