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

Merge branch 'release' into 'master'

Browse Source 
Release

See merge request !31
This commit is contained in:
Patrick J Cherry
2017-07-14 17:42:33 +01:00
parent b4426f5dce 5c37cba39b
commit 072f4be3c0
4 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@@ -1,3 +1,15 @@
flexnbd (0.1.7) stable; urgency=medium
* Return bytes_left in migration statistics.
-- Chris Elsworth <chris.elsworth@bytemark.co.uk> Fri, 14 Jul 2017 17:00:38 +0100
flexnbd (0.1.6) stable; urgency=medium
* Remove lots of per-cpu compiler flags, notably march=native.
-- Patrick J Cherry <patrick@bytemark.co.uk> Thu, 13 Apr 2017 12:48:23 +0100
flexnbd (0.1.5) stable; urgency=medium flexnbd (0.1.5) stable; urgency=medium
* Switched to native packaging. * Switched to native packaging.

2
src/server/status.c
View File

@@ -31,6 +31,7 @@ struct status * status_create( struct server * serve )
status->migration_speed_limit = serve->mirror->max_bytes_per_second; status->migration_speed_limit = serve->mirror->max_bytes_per_second;
status->migration_seconds_left = server_mirror_eta( serve ); status->migration_seconds_left = server_mirror_eta( serve );
status->migration_bytes_left = server_mirror_bytes_remaining( serve );
} }
server_unlock_start_mirror( serve ); server_unlock_start_mirror( serve );
@@ -60,6 +61,7 @@ int status_write( struct status * status, int fd )
PRINT_UINT64( migration_speed ); PRINT_UINT64( migration_speed );
PRINT_UINT64( migration_duration ); PRINT_UINT64( migration_duration );
PRINT_UINT64( migration_seconds_left ); PRINT_UINT64( migration_seconds_left );
PRINT_UINT64( migration_bytes_left );
if ( status->migration_speed_limit < UINT64_MAX ) { if ( status->migration_speed_limit < UINT64_MAX ) {
PRINT_UINT64( migration_speed_limit ); PRINT_UINT64( migration_speed_limit );
}; };

3
src/server/status.h
View File

@@ -64,6 +64,8 @@
* Our current best estimate of how many seconds are left before the migration * Our current best estimate of how many seconds are left before the migration
* migration is finished. * migration is finished.
* *
* migration_bytes_left:
* The number of bytes remaining to migrate.
*/ */
@@ -84,6 +86,7 @@ struct status {
uint64_t migration_speed; uint64_t migration_speed;
uint64_t migration_speed_limit; uint64_t migration_speed_limit;
uint64_t migration_seconds_left; uint64_t migration_seconds_left;
uint64_t migration_bytes_left;
}; };
/** Create a status object for the given server. */ /** Create a status object for the given server. */

4
tests/unit/check_status.c
View File

@@ -308,6 +308,7 @@ START_TEST( test_renders_migration_statistics )
status.migration_speed = 40000000; status.migration_speed = 40000000;
status.migration_speed_limit = 40000001; status.migration_speed_limit = 40000001;
status.migration_seconds_left = 1; status.migration_seconds_left = 1;
status.migration_bytes_left = 5000;
status_write( &status, fds[1] ); status_write( &status, fds[1] );
fail_if_rendered( fds[0], "migration_duration" ); fail_if_rendered( fds[0], "migration_duration" );
@@ -335,6 +336,9 @@ START_TEST( test_renders_migration_statistics )
status_write( &status, fds[1] ); status_write( &status, fds[1] );
fail_unless_rendered( fds[0], "migration_seconds_left=1" ); fail_unless_rendered( fds[0], "migration_seconds_left=1" );
status_write( &status, fds[1] );
fail_unless_rendered( fds[0], "migration_bytes_left=5000" );
status.migration_speed_limit = UINT64_MAX; status.migration_speed_limit = UINT64_MAX;
status_write( &status, fds[1] ); status_write( &status, fds[1] );