bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flexnbd status: Actually output pass statistics

Browse Source
This commit is contained in:
nick
2013-07-08 14:27:04 +01:00
parent f4bfc70a4b
commit afe76debf7
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/status.c
View File

@@ -44,6 +44,8 @@ int status_write( struct status * status, int fd )
if ( status->is_mirroring ) { if ( status->is_mirroring ) {
PRINT_INT( migration_pass ); PRINT_INT( migration_pass );
PRINT_UINT64( pass_dirty_bytes );
PRINT_UINT64( pass_clean_bytes );
} }
dprintf(fd, "\n"); dprintf(fd, "\n");

34
tests/unit/check_status.c
View File

@@ -255,6 +255,39 @@ START_TEST( test_renders_migration_pass )
} }
END_TEST END_TEST
START_TEST( test_renders_pass_statistics )
{
struct status status;
int fds[2];
pipe(fds);
char buf[1024] = {0};
char *found;
status.is_mirroring = 0;
status.pass_dirty_bytes = 2048;
status.pass_clean_bytes = 4096;
status_write( &status, fds[1] );
fail_unless( read_until_newline( fds[0], buf, 1024 ) > 0,
"Couldn't read the result" );
found = strstr( buf, "pass_dirty_bytes" );
fail_if( NULL != found, "migration pass output when not migrating" );
found = strstr( buf, "pass_clean_bytes" );
fail_if( NULL != found, "migration pass output when not migrating" );
status.is_mirroring = 1;
status_write( &status, fds[1] );
fail_unless( read_until_newline( fds[0], buf, 1024 ) > 0,
"Couldn't read the result" );
found = strstr( buf, "pass_dirty_bytes=2048" );
fail_if( NULL == found, "migration pass not output when not migrating" );
found = strstr( buf, "pass_clean_bytes=4096" );
fail_if( NULL == found, "migration pass not output when not migrating" );
}
END_TEST
Suite *status_suite(void) Suite *status_suite(void)
@@ -277,6 +310,7 @@ Suite *status_suite(void)
tcase_add_test(tc_render, test_renders_pid); tcase_add_test(tc_render, test_renders_pid);
tcase_add_test(tc_render, test_renders_size); tcase_add_test(tc_render, test_renders_size);
tcase_add_test(tc_render, test_renders_migration_pass); tcase_add_test(tc_render, test_renders_migration_pass);
tcase_add_test(tc_render, test_renders_pass_statistics);
suite_add_tcase(s, tc_create); suite_add_tcase(s, tc_create);
suite_add_tcase(s, tc_render); suite_add_tcase(s, tc_render);