Commit a4207e3b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging 



# gpg: Signature made Wed 16 May 2018 18:38:15 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  nfs: Remove processed options from QDict
  nfs: Fix error path in nfs_options_qdict_to_qapi()
  blockjob: do not cancel timer in resume
  qemu-iotests: reduce chance of races in 185

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents eb7514ae c82be42c

block/nfs.c

+8 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options, 
    BlockdevOptionsNfs *opts = NULL;

    QObject *crumpled = NULL;

    Visitor *v;

    const QDictEntry *e;

    Error *local_err = NULL;



    crumpled = qdict_crumple(options, errp);
@@ -570,9 +571,16 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options, 
    qobject_unref(crumpled);



    if (local_err) {

        error_propagate(errp, local_err);

        return NULL;

    }



    /* Remove the processed options from the QDict (the visitor processes

     * _all_ options in the QDict) */

    while ((e = qdict_first(options))) {

        qdict_del(options, e->key);

    }



    return opts;

}

blockjob.c

+15 −7
Original line number Diff line number Diff line
@@ -209,6 +209,18 @@ static void block_job_txn_del_job(BlockJob *job) 
    }

}



/* Assumes the block_job_mutex is held */

static bool block_job_timer_pending(BlockJob *job)

{

    return timer_pending(&job->sleep_timer);

}



/* Assumes the block_job_mutex is held */

static bool block_job_timer_not_pending(BlockJob *job)

{

    return !block_job_timer_pending(job);

}



static void block_job_pause(BlockJob *job)

{

    job->pause_count++;
@@ -221,7 +233,9 @@ static void block_job_resume(BlockJob *job) 
    if (job->pause_count) {

        return;

    }

    block_job_enter(job);



    /* kick only if no timer is pending */

    block_job_enter_cond(job, block_job_timer_not_pending);

}



void block_job_ref(BlockJob *job)
@@ -656,12 +670,6 @@ static void block_job_completed_txn_success(BlockJob *job) 
    }

}



/* Assumes the block_job_mutex is held */

static bool block_job_timer_pending(BlockJob *job)

{

    return timer_pending(&job->sleep_timer);

}



void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)

{

    int64_t old_speed = job->speed;

tests/qemu-iotests/185

+13 −4
Original line number Diff line number Diff line
@@ -101,14 +101,11 @@ echo 
# command to be received (after receiving the command, the rest runs

# synchronously, so jobs can arbitrarily continue or complete).

#

# Jobs present while QEMU is terminating iterate once more due to

# bdrv_drain_all().

#

# The buffer size for commit and streaming is 512k (waiting for 8 seconds after

# the first request), for active commit and mirror it's large enough to cover

# the full 4M, and for backup it's the qcow2 cluster size, which we know is

# 64k. As all of these are at least as large as the speed, we are sure that the

# offset advances exactly twice before qemu exits.

# offset advances exactly once before qemu exits.



_send_qemu_cmd $h \

    "{ 'execute': 'block-commit',
@@ -118,6 +115,9 @@ _send_qemu_cmd $h \ 
                      'speed': 65536 } }" \

    "return"



# If we don't sleep here 'quit' command races with disk I/O

sleep 0.5



_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"

wait=1 _cleanup_qemu
@@ -137,6 +137,9 @@ _send_qemu_cmd $h \ 
                      'speed': 65536 } }" \

    "return"



# If we don't sleep here 'quit' command races with disk I/O

sleep 0.5



_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"

wait=1 _cleanup_qemu
@@ -183,6 +186,9 @@ _send_qemu_cmd $h \ 
                      'speed': 65536 } }" \

    "return"



# If we don't sleep here 'quit' command races with disk I/O

sleep 0.5



_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"

wait=1 _cleanup_qemu
@@ -201,6 +207,9 @@ _send_qemu_cmd $h \ 
                      'speed': 65536 } }" \

    "return"



# If we don't sleep here 'quit' command races with disk I/O

sleep 0.5



_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"

wait=1 _cleanup_qemu

tests/qemu-iotests/185.out

+5 −7
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 backing_file=TEST_DIR/t.q 
{"return": {}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", "len": 67108864, "offset": 1048576, "speed": 65536, "type": "commit"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", "len": 67108864, "offset": 524288, "speed": 65536, "type": "commit"}}



=== Start active commit job and exit qemu ===
@@ -28,8 +28,7 @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 backing_file=TEST_DIR/t.q 
{"return": {}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "disk", "len": 4194304, "offset": 4194304, "speed": 65536, "type": "commit"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "disk", "len": 4194304, "offset": 4194304, "speed": 65536, "type": "commit"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", "len": 4194304, "offset": 4194304, "speed": 65536, "type": "commit"}}



=== Start mirror job and exit qemu ===
@@ -38,8 +37,7 @@ Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 size=67108864 cluster_size=65536 l 
{"return": {}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "disk", "len": 4194304, "offset": 4194304, "speed": 65536, "type": "mirror"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "disk", "len": 4194304, "offset": 4194304, "speed": 65536, "type": "mirror"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", "len": 4194304, "offset": 4194304, "speed": 65536, "type": "mirror"}}



=== Start backup job and exit qemu ===
@@ -48,7 +46,7 @@ Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 size=67108864 cluster_size=65536 l 
{"return": {}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", "len": 67108864, "offset": 131072, "speed": 65536, "type": "backup"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", "len": 67108864, "offset": 65536, "speed": 65536, "type": "backup"}}



=== Start streaming job and exit qemu ===
@@ -56,6 +54,6 @@ Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 size=67108864 cluster_size=65536 l 
{"return": {}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", "len": 67108864, "offset": 1048576, "speed": 65536, "type": "stream"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", "len": 67108864, "offset": 524288, "speed": 65536, "type": "stream"}}

No errors were found on the image.

*** done