Patrick J Cherry
9817fd7b0a
Final tidies, comments etc.
2018-02-09 11:42:25 +00:00
Patrick J Cherry
195de41d86
Remove extra line
2018-02-09 11:32:26 +00:00
Patrick J Cherry
b75a6529d0
Move LdPreload include to correct place
2018-02-09 10:41:24 +00:00
Patrick J Cherry
8e67180999
Check that TCP_NODELAY is set on upstream sockets on reconnection
...
Also rationalize the test to see if a function has been called. Still
not great, but getting there :)
2018-02-09 10:26:08 +00:00
Patrick J Cherry
c053a54faa
Added test to cover setsockopt for tcpkeepalive
2018-02-08 23:07:17 +00:00
Patrick J Cherry
ebacf738bc
Tidy up ld preload hacks
2018-02-08 22:28:34 +00:00
James Carter
c4bab3f81f
Merge branch 'truncate-odd-sized-discs' into 'develop'
...
Discs must be sized in multiples of 512 bytes or odd things happen
See merge request open-source/flexnbd-c!42
2018-02-08 16:49:36 +00:00
Patrick J Cherry
a19267b377
Adjust block-rounding line to match in serve.c
2018-02-08 16:37:36 +00:00
Patrick J Cherry
23d9ff587e
Updated changelog
2018-02-08 16:36:20 +00:00
Patrick J Cherry
347b7978e4
Discs must be sized in multiples of 512 bytes or odd things happen
...
In #36 some of the odd errors were due to seeks beyond the end of the
disc. This was because the disc was "specially crafted" to be 25GB + 1
byte, which doesn't fit into the normal 512 byte sectors expected of a
disc. This lead to reads going beyond the end of the disc etc.
If a similarly evil disc is used with `losetup`, it just ignores the
last bytes of the disc that don't fit into 512 chunks. This is what
that patch does, logging an error at the same time.
2018-02-08 16:31:28 +00:00
James Carter
1672b4b88b
Merge branch '36-breaks-when-trying-to-install-debian-from-cd' into 'develop'
...
Resolve "breaks when trying to install debian from CD"
Closes #36
See merge request open-source/flexnbd-c!40
2018-02-08 13:59:12 +00:00
Patrick J Cherry
5e9dbbd626
Updated changelgo
2018-02-08 13:32:10 +00:00
Patrick J Cherry
8beb3f0af6
Allow proxy to pass NBD protocol errors downstream; server returns EINVAL/ENOSPC appropriately
...
Previously the proxy would just disconnect when it saw an NBD protocol
error, and retry the operation it was in the middle of.
Additionally, the server needs to return the correct error types when
this happens.
2018-02-08 13:19:51 +00:00
James Carter
806de13024
Merge branch 'try-flags' into 'develop'
...
Set flags to show we can accept FUA and FLUSH commands
See merge request open-source/flexnbd-c!38
2018-02-08 11:18:31 +00:00
Patrick J Cherry
f71b872622
Only set up LD_PRELOAD for tests that actually need it.
2018-02-07 22:05:07 +00:00
Patrick J Cherry
79181b3153
Added LD_PRELOAD library to monitor msync calls in testing
2018-02-07 21:45:20 +00:00
Patrick J Cherry
55548cc969
Change ordering of @env configuration/start so we can alter the blocksize.
...
argh.
2018-02-06 10:24:54 +00:00
Patrick J Cherry
9bf3b52d54
Call proxy_finish_connect_to_upstream when reconnecting, setting
...
TCP_NODELAY
2018-02-06 10:02:16 +00:00
Patrick J Cherry
da35187af0
Allow blocksize to be changed in Environment
...
This number is peppered all over the test suite, so changing @blocksize
for everything is not a goer, when we really only need to change it for
one test.
2018-02-06 09:55:32 +00:00
Patrick J Cherry
7704f9e5c8
Fix tests to reflect new filesize.
2018-02-06 07:57:40 +00:00
Patrick J Cherry
3a86870c9f
Use sysconf to determine actual page size for msync
...
Also added comments in tests around testing for msync offsets/lengths.
2018-02-06 07:32:58 +00:00
Patrick J Cherry
6d6948af09
Fix offset calculation for partial msyncs to go to nearest 4k block
...
Previously they were always set to zero.
2018-02-05 23:05:00 +00:00
Patrick J Cherry
c423900f02
Fix typo
2018-02-05 17:04:23 +00:00
Patrick J Cherry
afa1bb0efb
Use msync rather than fsync to flush the entire disc
...
This involves storing the size of the mapped disc in the client struct,
and then supplying that to the msync command.
2018-02-05 17:01:32 +00:00
Patrick J Cherry
ad2014ac9d
Fixed long-standing bug with h2r functions being back to front
...
h2r seemd to be using beXXtoh functions instead of htobeXX. Foruntately
ROT13 works symmetrically on our systems..!
2018-02-05 16:16:17 +00:00
Patrick J Cherry
d1dc7392c2
Open file with O_NOATIME, not O_SYNC
...
O_SYNC is not necessary as we're not doing direct writes to the file.
O_NOATIME might give some speed boost.
2018-02-05 16:15:36 +00:00
Patrick J Cherry
ba59a4c03f
Updated changelog
2018-02-05 08:15:56 +00:00
Patrick J Cherry
2b58468800
Added test for FUA acceptance.
...
Although I think this might be a bit useless as servers normally just
ingore flags.
2018-02-03 20:29:15 +00:00
Patrick J Cherry
4d9db4d6e9
Added basic FLUSH test
2018-02-03 20:10:47 +00:00
Patrick J Cherry
d6057a4244
Use 'English' in ruby
2018-02-02 21:41:07 +00:00
Patrick J Cherry
1d98ba1d3e
Further rubocopping
2018-02-02 21:36:30 +00:00
Patrick J Cherry
9c48da82cc
Rubocop
2018-02-02 21:34:14 +00:00
Patrick J Cherry
1b7b688f7a
Tidied up nbd init test
2018-02-02 21:30:55 +00:00
Patrick J Cherry
3410ccd4c5
Fixed up commenting around our advertised flags.
2018-02-02 20:50:48 +00:00
Patrick J Cherry
051576df6d
Remove warnings about Object#timeout
2018-02-02 20:46:46 +00:00
Patrick J Cherry
9eb7072f49
Removed some extra spaces I'd added
2018-02-02 20:46:25 +00:00
Patrick J Cherry
6aa5907f5e
Tidied constants up a bit
2018-02-02 20:34:49 +00:00
Patrick J Cherry
72c8c6f757
Altered test to check for type as a 16-bit uint; added flags test
2018-02-02 20:30:39 +00:00
Patrick J Cherry
b22b99d9b9
Fix fill_request to set flags as well as type.
2018-02-02 20:28:00 +00:00
Patrick J Cherry
ad001cb83c
Tidy comments
2018-02-02 16:17:01 +00:00
Patrick J Cherry
f37e4438c8
Merge branch 'develop' into try-flags
2018-02-02 16:05:57 +00:00
Chris Elsworth
084d429961
Merge branch 'update-changelog-for-mr35' into 'develop'
...
Updated changelog for !35
See merge request open-source/flexnbd-c!39
2018-02-02 14:57:58 +00:00
Patrick J Cherry
1883bee43c
Updated changelog for !35
2018-02-02 14:52:26 +00:00
Patrick J Cherry
68a196e93d
Allow the proxy connection to pass through flags from upstream.
2018-02-02 10:30:40 +00:00
Patrick J Cherry
1f0ef0aad6
Implement FLUSH command and honour FUA flag
...
I changed the request struct to break the 32 bits reserved for the
request type into two. The first part of this is used for the flags
(such as FUA), and the second part for the command type. Previously
we'd masked the top two bytes, thus ignoring any flags.
2018-02-01 22:13:59 +00:00
Patrick J Cherry
25cc084108
First steps towards implementing flags as part of oldstyle negotiation
2018-02-01 19:25:36 +00:00
Patrick J Cherry
f2fa00260b
Merge branch 'avoid-crash-on-timeout' into 'develop'
...
avoid fatal error on client connection timeout
See merge request open-source/flexnbd-c!36
2018-01-26 16:04:51 +00:00
James F. Carter
b2007c9dad
debian: uodate changelog
2018-01-26 15:06:26 +00:00
James F. Carter
9b1781164a
avoid fatal error on client connection timeout
2018-01-26 15:03:44 +00:00
Ian Chilton
1f99929589
Merge branch 'develop' into 'develop'
...
Develop
See merge request open-source/flexnbd-c!35
2018-01-24 12:42:49 +00:00
