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

tests: read messages instead of syslog

Browse Source 
Since on those older system there is rather 'fight' over
syslog reading buffer - lets read output from /var/log/messages
intead.
This commit is contained in:
Zdenek Kabelac 2016-09-20 22:36:29 +02:00
parent a9c2a62939
commit 994df22b60
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,7 +558,6 @@ struct FileSource : Source {
struct KMsg : Source { struct KMsg : Source {
bool can_clear; bool can_clear;
bool syslog;
ssize_t buffer_size; 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") ),
@ -567,21 +566,24 @@ struct KMsg : Source {
#ifdef __unix #ifdef __unix
struct utsname uts; struct utsname uts;
unsigned kmaj, kmin, krel; unsigned kmaj, kmin, krel;
const char *read_msg = "/dev/kmsg";
// Can't use kmsg on kernels pre 3.5, relay on syslog for that case // Can't use kmsg on kernels pre 3.5, read /var/log/messages
syslog = ( ( ::uname(&uts) == 0 ) && if ( ( ::uname(&uts) == 0 ) &&
( ::sscanf( uts.release, "%u.%u.%u", &kmaj, &kmin, &krel ) == 3 ) && ( ::sscanf( uts.release, "%u.%u.%u", &kmaj, &kmin, &krel ) == 3 ) &&
( ( kmaj < 3 ) || ( ( kmaj == 3 ) && ( kmin < 5 ) ) ) ); ( ( kmaj < 5 ) || ( ( kmaj == 3 ) && ( kmin < 5 ) ) ) )
can_clear = false, read_msg = "/var/log/messages";
if ( syslog ) if ( ( fd = open(read_msg, O_RDONLY | O_NONBLOCK)) < 0 ) {
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"); fprintf( stderr, "open log %s %s\n", read_msg, strerror( errno ) );
if ( klogctl( BRICK_SYSLOG_ACTION_CLEAR, 0, 0 ) < 0 ) if ( can_clear && ( klogctl( BRICK_SYSLOG_ACTION_CLEAR, 0, 0 ) < 0 ) )
can_clear = false; can_clear = false;
} else if (lseek(fd, 0L, SEEK_END) == (off_t) -1) } else if ( lseek( fd, 0L, SEEK_END ) == (off_t) -1 ) {
perror("lseek /dev/kmsg"); fprintf( stderr, "lseek log %s %s\n", read_msg, strerror( errno ) );
close(fd);
fd = -1;
}
#endif #endif
} }
@ -594,11 +596,7 @@ struct KMsg : Source {
ssize_t sz; ssize_t sz;
char buf[ buffer_size ]; char buf[ buffer_size ];
if ( syslog ) { if ( dev_kmsg() ) {
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 ) 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 ) {