[v6,2/3] qmp event: Refactor QUORUM_REPORT_BAD

Commit Message

Changlong Xie Feb. 25, 2016, 5:33 a.m. UTC

Introduce QuorumOpType, and make QUORUM_REPORT_BAD compatible
with it.

Cc: Dr. David Alan Gilbert <[e-mail]>
Cc: Wen Congyang <[e-mail]>
Signed-off-by: Wen Congyang <[e-mail]>
Signed-off-by: Changlong Xie <[e-mail]>
---
 block/quorum.c      | 17 ++++++++++++-----
 docs/qmp-events.txt | 11 ++++++++++-
 qapi/block.json     | 16 ++++++++++++++++
 qapi/event.json     |  4 +++-
 4 files changed, 41 insertions(+), 7 deletions(-)

Comments

Alberto Garcia Feb. 25, 2016, 10:57 a.m. UTC | #1

On Thu 25 Feb 2016 06:33:08 AM CET, Changlong Xie <[e-mail]> wrote:
> +Read/Write operation:
>  { "event": "QUORUM_REPORT_BAD",
> -     "data": { "node-name": "node0", "sector-num": 345435, "sectors-count": 5 },
> +     "data": { "node-name": "node0", "sector-num": 345435, "sectors-count": 5,
> +     "type": "read" },
>       "timestamp": { "seconds": 1344522075, "microseconds": 745528 } }

Since you introduced the 'type' field and this is now an example of a
read error, you can change the description to say simply "Read
operation:". In my opinion there's no need to add yet another example
for a write operation, I think it's clear enough.

> +Flush operation:
> +{ "event": "QUORUM_REPORT_BAD",
> +     "data": { "node-name": "node0", "sector-num": 0, "sectors-count": 2097120,
> +     "type": "flush", "error": "Broken pipe" },
> +     "timestamp": { "seconds": 1456406829, "microseconds": 291763 } }

Here (and in the previous case) please indent "type" so it goes under
"node-name":

   { "event": "QUORUM_REPORT_BAD",
     "data": { "node-name": "node0", "sector-num": 0, "sectors-count": 2097120,
               "type": "flush", "error": "Broken pipe" },
     "timestamp": { "seconds": 1456406829, "microseconds": 291763 } }

Otherwise I think the patch looks perfect now. Thanks!

Berto

Changlong Xie Feb. 26, 2016, 1:20 a.m. UTC | #2

On 02/25/2016 06:57 PM, Alberto Garcia wrote:
> On Thu 25 Feb 2016 06:33:08 AM CET, Changlong Xie <[e-mail]> wrote:
>> +Read/Write operation:
>>   { "event": "QUORUM_REPORT_BAD",
>> -     "data": { "node-name": "node0", "sector-num": 345435, "sectors-count": 5 },
>> +     "data": { "node-name": "node0", "sector-num": 345435, "sectors-count": 5,
>> +     "type": "read" },
>>        "timestamp": { "seconds": 1344522075, "microseconds": 745528 } }
>
> Since you introduced the 'type' field and this is now an example of a
> read error, you can change the description to say simply "Read
> operation:". In my opinion there's no need to add yet another example
> for a write operation, I think it's clear enough.

Ok

>
>> +Flush operation:
>> +{ "event": "QUORUM_REPORT_BAD",
>> +     "data": { "node-name": "node0", "sector-num": 0, "sectors-count": 2097120,
>> +     "type": "flush", "error": "Broken pipe" },
>> +     "timestamp": { "seconds": 1456406829, "microseconds": 291763 } }
>
> Here (and in the previous case) please indent "type" so it goes under

Surely.

> "node-name":
>
>     { "event": "QUORUM_REPORT_BAD",
>       "data": { "node-name": "node0", "sector-num": 0, "sectors-count": 2097120,
>                 "type": "flush", "error": "Broken pipe" },
>       "timestamp": { "seconds": 1456406829, "microseconds": 291763 } }
>
> Otherwise I think the patch looks perfect now. Thanks!
>

Thanks for your review. Will send another series.

Thanks
	-Xie

> Berto
>
>
> .
>

Patch

diff --git a/block/quorum.c b/block/quorum.c
index f78d4cb..974fff9 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -218,14 +218,16 @@  static QuorumAIOCB *quorum_aio_get(BDRVQuorumState *s,
     return acb;
 }
 
-static void quorum_report_bad(QuorumAIOCB *acb, char *node_name, int ret)
+static void quorum_report_bad(QuorumOpType type, uint64_t sector_num,
+                              int nb_sectors, char *node_name, int ret)
 {
     const char *msg = NULL;
     if (ret < 0) {
         msg = strerror(-ret);
     }
-    qapi_event_send_quorum_report_bad(!!msg, msg, node_name,
-                                      acb->sector_num, acb->nb_sectors, &error_abort);
+
+    qapi_event_send_quorum_report_bad(type, !!msg, msg, node_name,
+                                      sector_num, nb_sectors, &error_abort);
 }
 
 static void quorum_report_failure(QuorumAIOCB *acb)
@@ -285,6 +287,7 @@  static void quorum_aio_cb(void *opaque, int ret)
     QuorumChildRequest *sacb = opaque;
     QuorumAIOCB *acb = sacb->parent;
     BDRVQuorumState *s = acb->common.bs->opaque;
+    QuorumOpType type;
     bool rewrite = false;
 
     if (acb->is_read && s->read_pattern == QUORUM_READ_PATTERN_FIFO) {
@@ -303,12 +306,14 @@  static void quorum_aio_cb(void *opaque, int ret)
         return;
     }
 
+    type = acb->is_read ? QUORUM_OP_TYPE_READ : QUORUM_OP_TYPE_WRITE;
     sacb->ret = ret;
     acb->count++;
     if (ret == 0) {
         acb->success_count++;
     } else {
-        quorum_report_bad(acb, sacb->aiocb->bs->node_name, ret);
+        quorum_report_bad(type, acb->sector_num, acb->nb_sectors,
+                          sacb->aiocb->bs->node_name, ret);
     }
     assert(acb->count <= s->num_children);
     assert(acb->success_count <= s->num_children);
@@ -341,7 +346,9 @@  static void quorum_report_bad_versions(BDRVQuorumState *s,
             continue;
         }
         QLIST_FOREACH(item, &version->items, next) {
-            quorum_report_bad(acb, s->children[item->index]->bs->node_name, 0);
+            quorum_report_bad(QUORUM_OP_TYPE_READ, acb->sector_num,
+                              acb->nb_sectors,
+                              s->children[item->index]->bs->node_name, 0);
         }
     }
 }
diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
index afb5e20..96baacb 100644
--- a/docs/qmp-events.txt
+++ b/docs/qmp-events.txt
@@ -323,6 +323,7 @@  Emitted to report a corruption of a Quorum file.
 
 Data:
 
+- "type":          Quorum operation type
 - "error":         Error message (json-string, optional)
                    Only present on failure.  This field contains a human-readable
                    error message.  There are no semantics other than that the
@@ -334,10 +335,18 @@  Data:
 
 Example:
 
+Read/Write operation:
 { "event": "QUORUM_REPORT_BAD",
-     "data": { "node-name": "node0", "sector-num": 345435, "sectors-count": 5 },
+     "data": { "node-name": "node0", "sector-num": 345435, "sectors-count": 5,
+     "type": "read" },
      "timestamp": { "seconds": 1344522075, "microseconds": 745528 } }
 
+Flush operation:
+{ "event": "QUORUM_REPORT_BAD",
+     "data": { "node-name": "node0", "sector-num": 0, "sectors-count": 2097120,
+     "type": "flush", "error": "Broken pipe" },
+     "timestamp": { "seconds": 1456406829, "microseconds": 291763 } }
+
 Note: this event is rate-limited.
 
 RESET
diff --git a/qapi/block.json b/qapi/block.json
index 58e6b30..937337d 100644
--- a/qapi/block.json
+++ b/qapi/block.json
@@ -196,3 +196,19 @@ 
 ##
 { 'event': 'DEVICE_TRAY_MOVED',
   'data': { 'device': 'str', 'tray-open': 'bool' } }
+
+##
+# @QuorumOpType
+#
+# An enumeration of the quorum operation types
+#
+# @read: read operation
+#
+# @write: write operation
+#
+# @flush: flush operation
+#
+# Since: 2.6
+##
+{ 'enum': 'QuorumOpType',
+  'data': [ 'read', 'write', 'flush' ] }
diff --git a/qapi/event.json b/qapi/event.json
index cfcc887..a2b8db6 100644
--- a/qapi/event.json
+++ b/qapi/event.json
@@ -340,6 +340,8 @@ 
 #
 # Emitted to report a corruption of a Quorum file
 #
+# @type: quorum operation type (Since 2.6)
+#
 # @error: #optional, error message. Only present on failure. This field
 #         contains a human-readable error message. There are no semantics other
 #         than that the block layer reported an error and clients should not
@@ -354,7 +356,7 @@ 
 # Since: 2.0
 ##
 { 'event': 'QUORUM_REPORT_BAD',
-  'data': { '*error': 'str', 'node-name': 'str',
+  'data': { 'type': 'QuorumOpType', '*error': 'str', 'node-name': 'str',
             'sector-num': 'int', 'sectors-count': 'int' } }
 
 ##