 785ec4b1b9
			
		
	
	
		785ec4b1b9
		
	
	
	
	
		
			
			Some error messages contain ambiguous representations of the 'node-name'
parameter. This can be particularly confusing when exchanging QMP
messages (C = client, S = server):
C: {"execute": "block_resize", "arguments": { "device": "my_file", "size": 26843545600 }}
S: {"error": {"class": "GenericError", "desc": "Cannot find device=my_file nor node_name="}}
                                                                               ^^^^^^^^^
This error message suggests one could send a message with a key called
'node_name':
C: {"execute": "block_resize", "arguments": { "node_name": "my_file", "size": 26843545600 }}
                                               ^^^^^^^^^
but using the underscore is actually incorrect, the parameter should be
'node-name':
S: {"error": {"class": "GenericError", "desc": "Parameter 'node_name' is unexpected"}}
This behavior was uncovered in bz1651437, but I ended up going down a
rabbit hole looking for other areas where this miscommunication might
occur and changing those accordingly as well.
Fixes: https://bugzilla.redhat.com/1651437
Signed-off-by: Connor Kuehl <ckuehl@redhat.com>
Message-Id: <20210305151929.1947331-2-ckuehl@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
		
	
			
		
			
				
	
	
		
			250 lines
		
	
	
		
			9.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			250 lines
		
	
	
		
			9.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| QA output created by 223
 | |
| 
 | |
| === Create partially sparse image, then add dirty bitmaps ===
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
 | |
| wrote 2097152/2097152 bytes at offset 1048576
 | |
| 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| Testing:
 | |
| QMP_VERSION
 | |
| {"return": {}}
 | |
| {"return": {}}
 | |
| {"return": {}}
 | |
| {"return": {}}
 | |
| {"return": {}}
 | |
| {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
 | |
| 
 | |
| 
 | |
| === Write part of the file under active bitmap ===
 | |
| 
 | |
| wrote 512/512 bytes at offset 512
 | |
| 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| wrote 2097152/2097152 bytes at offset 2097152
 | |
| 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| 
 | |
| === End dirty bitmaps, and start serving image over NBD ===
 | |
| 
 | |
| {"execute":"qmp_capabilities"}
 | |
| {"return": {}}
 | |
| {"execute":"blockdev-add",
 | |
|   "arguments":{"driver":"IMGFMT", "node-name":"n",
 | |
|     "file":{"driver":"file", "filename":"TEST_DIR/t.IMGFMT"}}}
 | |
| {"return": {}}
 | |
| {"execute":"block-dirty-bitmap-disable",
 | |
|   "arguments":{"node":"n", "name":"b"}}
 | |
| {"return": {}}
 | |
| 
 | |
| === Set up NBD with normal access ===
 | |
| 
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n"}}
 | |
| {"error": {"class": "GenericError", "desc": "NBD server not running"}}
 | |
| {"execute":"nbd-server-start",
 | |
|   "arguments":{"addr":{"type":"unix",
 | |
|     "data":{"path":"SOCK_DIR/nbd"}}}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-start",
 | |
|   "arguments":{"addr":{"type":"unix",
 | |
|     "data":{"path":"SOCK_DIR/nbd1"}}}}
 | |
| {"error": {"class": "GenericError", "desc": "NBD server already running"}}
 | |
| exports available: 0
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n", "bitmap":"b"}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"nosuch"}}
 | |
| {"error": {"class": "GenericError", "desc": "Cannot find device='nosuch' nor node-name='nosuch'"}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n"}}
 | |
| {"error": {"class": "GenericError", "desc": "Block export id 'n' is already in use"}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n", "name":"n2",
 | |
|   "bitmap":"b2"}}
 | |
| {"error": {"class": "GenericError", "desc": "Enabled bitmap 'b2' incompatible with readonly export"}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n", "name":"n2",
 | |
|   "bitmap":"b3"}}
 | |
| {"error": {"class": "GenericError", "desc": "Bitmap 'b3' is not found"}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n", "name":"n2", "writable":true,
 | |
|   "description":"some text", "bitmap":"b2"}}
 | |
| {"return": {}}
 | |
| exports available: 2
 | |
|  export: 'n'
 | |
|   size:  4194304
 | |
|   flags: 0x58f ( readonly flush fua df multi cache )
 | |
|   min block: 1
 | |
|   opt block: 4096
 | |
|   max block: 33554432
 | |
|   available meta contexts: 2
 | |
|    base:allocation
 | |
|    qemu:dirty-bitmap:b
 | |
|  export: 'n2'
 | |
|   description: some text
 | |
|   size:  4194304
 | |
|   flags: 0xced ( flush fua trim zeroes df cache fast-zero )
 | |
|   min block: 1
 | |
|   opt block: 4096
 | |
|   max block: 33554432
 | |
|   available meta contexts: 2
 | |
|    base:allocation
 | |
|    qemu:dirty-bitmap:b2
 | |
| 
 | |
| === Contrast normal status to large granularity dirty-bitmap ===
 | |
| 
 | |
| read 512/512 bytes at offset 512
 | |
| 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| read 524288/524288 bytes at offset 524288
 | |
| 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| read 1048576/1048576 bytes at offset 1048576
 | |
| 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| read 2097152/2097152 bytes at offset 2097152
 | |
| 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| [{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 | |
| { "start": 1048576, "length": 3145728, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
 | |
| [{ "start": 0, "length": 65536, "depth": 0, "zero": false, "data": false},
 | |
| { "start": 65536, "length": 2031616, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]
 | |
| 
 | |
| === Contrast to small granularity dirty-bitmap ===
 | |
| 
 | |
| [{ "start": 0, "length": 512, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 512, "length": 512, "depth": 0, "zero": false, "data": false},
 | |
| { "start": 1024, "length": 2096128, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]
 | |
| 
 | |
| === End qemu NBD server ===
 | |
| 
 | |
| {"execute":"nbd-server-remove",
 | |
|   "arguments":{"name":"n"}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-remove",
 | |
|   "arguments":{"name":"n2"}}
 | |
| {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "n"}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-remove",
 | |
|   "arguments":{"name":"n2"}}
 | |
| {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "n2"}}
 | |
| {"error": {"class": "GenericError", "desc": "Export 'n2' is not found"}}
 | |
| {"execute":"nbd-server-stop"}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-stop"}
 | |
| {"error": {"class": "GenericError", "desc": "NBD server not running"}}
 | |
| 
 | |
| === Set up NBD with iothread access ===
 | |
| 
 | |
| {"execute":"x-blockdev-set-iothread",
 | |
|   "arguments":{"node-name":"n", "iothread":"io0"}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n"}}
 | |
| {"error": {"class": "GenericError", "desc": "NBD server not running"}}
 | |
| {"execute":"nbd-server-start",
 | |
|   "arguments":{"addr":{"type":"unix",
 | |
|     "data":{"path":"SOCK_DIR/nbd"}}}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-start",
 | |
|   "arguments":{"addr":{"type":"unix",
 | |
|     "data":{"path":"SOCK_DIR/nbd1"}}}}
 | |
| {"error": {"class": "GenericError", "desc": "NBD server already running"}}
 | |
| exports available: 0
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n", "bitmap":"b"}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"nosuch"}}
 | |
| {"error": {"class": "GenericError", "desc": "Cannot find device='nosuch' nor node-name='nosuch'"}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n"}}
 | |
| {"error": {"class": "GenericError", "desc": "Block export id 'n' is already in use"}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n", "name":"n2",
 | |
|   "bitmap":"b2"}}
 | |
| {"error": {"class": "GenericError", "desc": "Enabled bitmap 'b2' incompatible with readonly export"}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n", "name":"n2",
 | |
|   "bitmap":"b3"}}
 | |
| {"error": {"class": "GenericError", "desc": "Bitmap 'b3' is not found"}}
 | |
| {"execute":"nbd-server-add",
 | |
|   "arguments":{"device":"n", "name":"n2", "writable":true,
 | |
|   "description":"some text", "bitmap":"b2"}}
 | |
| {"return": {}}
 | |
| exports available: 2
 | |
|  export: 'n'
 | |
|   size:  4194304
 | |
|   flags: 0x58f ( readonly flush fua df multi cache )
 | |
|   min block: 1
 | |
|   opt block: 4096
 | |
|   max block: 33554432
 | |
|   available meta contexts: 2
 | |
|    base:allocation
 | |
|    qemu:dirty-bitmap:b
 | |
|  export: 'n2'
 | |
|   description: some text
 | |
|   size:  4194304
 | |
|   flags: 0xced ( flush fua trim zeroes df cache fast-zero )
 | |
|   min block: 1
 | |
|   opt block: 4096
 | |
|   max block: 33554432
 | |
|   available meta contexts: 2
 | |
|    base:allocation
 | |
|    qemu:dirty-bitmap:b2
 | |
| 
 | |
| === Contrast normal status to large granularity dirty-bitmap ===
 | |
| 
 | |
| read 512/512 bytes at offset 512
 | |
| 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| read 524288/524288 bytes at offset 524288
 | |
| 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| read 1048576/1048576 bytes at offset 1048576
 | |
| 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| read 2097152/2097152 bytes at offset 2097152
 | |
| 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | |
| [{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 | |
| { "start": 1048576, "length": 3145728, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
 | |
| [{ "start": 0, "length": 65536, "depth": 0, "zero": false, "data": false},
 | |
| { "start": 65536, "length": 2031616, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]
 | |
| 
 | |
| === Contrast to small granularity dirty-bitmap ===
 | |
| 
 | |
| [{ "start": 0, "length": 512, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 512, "length": 512, "depth": 0, "zero": false, "data": false},
 | |
| { "start": 1024, "length": 2096128, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]
 | |
| 
 | |
| === End qemu NBD server ===
 | |
| 
 | |
| {"execute":"nbd-server-remove",
 | |
|   "arguments":{"name":"n"}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-remove",
 | |
|   "arguments":{"name":"n2"}}
 | |
| {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "n"}}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-remove",
 | |
|   "arguments":{"name":"n2"}}
 | |
| {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "n2"}}
 | |
| {"error": {"class": "GenericError", "desc": "Export 'n2' is not found"}}
 | |
| {"execute":"nbd-server-stop"}
 | |
| {"return": {}}
 | |
| {"execute":"nbd-server-stop"}
 | |
| {"error": {"class": "GenericError", "desc": "NBD server not running"}}
 | |
| {"execute":"quit"}
 | |
| {"return": {}}
 | |
| {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
 | |
| 
 | |
| === Use qemu-nbd as server ===
 | |
| 
 | |
| [{ "start": 0, "length": 65536, "depth": 0, "zero": false, "data": false},
 | |
| { "start": 65536, "length": 2031616, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]
 | |
| [{ "start": 0, "length": 512, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 512, "length": 512, "depth": 0, "zero": false, "data": false},
 | |
| { "start": 1024, "length": 11321, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
 | |
| [{ "start": 12345, "length": 2084807, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 | |
| { "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]
 | |
| *** done
 |