| Message ID | 1503602048-12268-13-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu 24 Aug 2017 09:14:04 PM CEST, Markus Armbruster wrote: > Cc: Alberto Garcia <berto@igalia.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> I'm not even sure about the difference between block.json and block-core.json :) but I'm fine with the move anyway. Reviewed-by: Alberto Garcia <berto@igalia.com> Berto
On Thu, Aug 24, 2017 at 9:25 PM Markus Armbruster <armbru@redhat.com> wrote: > Cc: Alberto Garcia <berto@igalia.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > qapi/block.json | 68 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > qapi/event.json | 68 > --------------------------------------------------------- > 2 files changed, 68 insertions(+), 68 deletions(-) > > diff --git a/qapi/block.json b/qapi/block.json > index 414b61b..8ce3357 100644 > --- a/qapi/block.json > +++ b/qapi/block.json > @@ -277,3 +277,71 @@ > ## > { 'enum': 'QuorumOpType', > 'data': [ 'read', 'write', 'flush' ] } > + > +## > +# @QUORUM_FAILURE: > +# > +# Emitted by the Quorum block driver if it fails to establish a quorum > +# > +# @reference: device name if defined else node name > +# > +# @sector-num: number of the first sector of the failed read operation > +# > +# @sectors-count: failed read operation sector count > +# > +# Note: This event is rate-limited. > +# > +# Since: 2.0 > +# > +# Example: > +# > +# <- { "event": "QUORUM_FAILURE", > +# "data": { "reference": "usr1", "sector-num": 345435, > "sectors-count": 5 }, > +# "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } > +# > +## > +{ 'event': 'QUORUM_FAILURE', > + 'data': { 'reference': 'str', 'sector-num': 'int', 'sectors-count': > 'int' } } > + > +## > +# @QUORUM_REPORT_BAD: > +# > +# Emitted to report a corruption of a Quorum file > +# > +# @type: quorum operation type (Since 2.6) > +# > +# @error: 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 > +# try to interpret the error string. > +# > +# @node-name: the graph node name of the block driver state > +# > +# @sector-num: number of the first sector of the failed read operation > +# > +# @sectors-count: failed read operation sector count > +# > +# Note: This event is rate-limited. > +# > +# Since: 2.0 > +# > +# Example: > +# > +# 1. Read operation > +# > +# { "event": "QUORUM_REPORT_BAD", > +# "data": { "node-name": "node0", "sector-num": 345435, > "sectors-count": 5, > +# "type": "read" }, > +# "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } > +# > +# 2. 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 } } > +# > +## > +{ 'event': 'QUORUM_REPORT_BAD', > + 'data': { 'type': 'QuorumOpType', '*error': 'str', 'node-name': 'str', > + 'sector-num': 'int', 'sectors-count': 'int' } } > diff --git a/qapi/event.json b/qapi/event.json > index a043de4..48a5d8f 100644 > --- a/qapi/event.json > +++ b/qapi/event.json > @@ -92,74 +92,6 @@ > 'data': { 'actual': 'int' } } > > ## > -# @QUORUM_FAILURE: > -# > -# Emitted by the Quorum block driver if it fails to establish a quorum > -# > -# @reference: device name if defined else node name > -# > -# @sector-num: number of the first sector of the failed read operation > -# > -# @sectors-count: failed read operation sector count > -# > -# Note: This event is rate-limited. > -# > -# Since: 2.0 > -# > -# Example: > -# > -# <- { "event": "QUORUM_FAILURE", > -# "data": { "reference": "usr1", "sector-num": 345435, > "sectors-count": 5 }, > -# "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } > -# > -## > -{ 'event': 'QUORUM_FAILURE', > - 'data': { 'reference': 'str', 'sector-num': 'int', 'sectors-count': > 'int' } } > - > -## > -# @QUORUM_REPORT_BAD: > -# > -# Emitted to report a corruption of a Quorum file > -# > -# @type: quorum operation type (Since 2.6) > -# > -# @error: 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 > -# try to interpret the error string. > -# > -# @node-name: the graph node name of the block driver state > -# > -# @sector-num: number of the first sector of the failed read operation > -# > -# @sectors-count: failed read operation sector count > -# > -# Note: This event is rate-limited. > -# > -# Since: 2.0 > -# > -# Example: > -# > -# 1. Read operation > -# > -# { "event": "QUORUM_REPORT_BAD", > -# "data": { "node-name": "node0", "sector-num": 345435, > "sectors-count": 5, > -# "type": "read" }, > -# "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } > -# > -# 2. 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 } } > -# > -## > -{ 'event': 'QUORUM_REPORT_BAD', > - 'data': { 'type': 'QuorumOpType', '*error': 'str', 'node-name': 'str', > - 'sector-num': 'int', 'sectors-count': 'int' } } > - > -## > # @MEM_UNPLUG_ERROR: > # > # Emitted when memory hot unplug error occurs. > -- > 2.7.5 > > > -- Marc-André Lureau
diff --git a/qapi/block.json b/qapi/block.json index 414b61b..8ce3357 100644 --- a/qapi/block.json +++ b/qapi/block.json @@ -277,3 +277,71 @@ ## { 'enum': 'QuorumOpType', 'data': [ 'read', 'write', 'flush' ] } + +## +# @QUORUM_FAILURE: +# +# Emitted by the Quorum block driver if it fails to establish a quorum +# +# @reference: device name if defined else node name +# +# @sector-num: number of the first sector of the failed read operation +# +# @sectors-count: failed read operation sector count +# +# Note: This event is rate-limited. +# +# Since: 2.0 +# +# Example: +# +# <- { "event": "QUORUM_FAILURE", +# "data": { "reference": "usr1", "sector-num": 345435, "sectors-count": 5 }, +# "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } +# +## +{ 'event': 'QUORUM_FAILURE', + 'data': { 'reference': 'str', 'sector-num': 'int', 'sectors-count': 'int' } } + +## +# @QUORUM_REPORT_BAD: +# +# Emitted to report a corruption of a Quorum file +# +# @type: quorum operation type (Since 2.6) +# +# @error: 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 +# try to interpret the error string. +# +# @node-name: the graph node name of the block driver state +# +# @sector-num: number of the first sector of the failed read operation +# +# @sectors-count: failed read operation sector count +# +# Note: This event is rate-limited. +# +# Since: 2.0 +# +# Example: +# +# 1. Read operation +# +# { "event": "QUORUM_REPORT_BAD", +# "data": { "node-name": "node0", "sector-num": 345435, "sectors-count": 5, +# "type": "read" }, +# "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } +# +# 2. 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 } } +# +## +{ 'event': 'QUORUM_REPORT_BAD', + 'data': { 'type': 'QuorumOpType', '*error': 'str', 'node-name': 'str', + 'sector-num': 'int', 'sectors-count': 'int' } } diff --git a/qapi/event.json b/qapi/event.json index a043de4..48a5d8f 100644 --- a/qapi/event.json +++ b/qapi/event.json @@ -92,74 +92,6 @@ 'data': { 'actual': 'int' } } ## -# @QUORUM_FAILURE: -# -# Emitted by the Quorum block driver if it fails to establish a quorum -# -# @reference: device name if defined else node name -# -# @sector-num: number of the first sector of the failed read operation -# -# @sectors-count: failed read operation sector count -# -# Note: This event is rate-limited. -# -# Since: 2.0 -# -# Example: -# -# <- { "event": "QUORUM_FAILURE", -# "data": { "reference": "usr1", "sector-num": 345435, "sectors-count": 5 }, -# "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } -# -## -{ 'event': 'QUORUM_FAILURE', - 'data': { 'reference': 'str', 'sector-num': 'int', 'sectors-count': 'int' } } - -## -# @QUORUM_REPORT_BAD: -# -# Emitted to report a corruption of a Quorum file -# -# @type: quorum operation type (Since 2.6) -# -# @error: 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 -# try to interpret the error string. -# -# @node-name: the graph node name of the block driver state -# -# @sector-num: number of the first sector of the failed read operation -# -# @sectors-count: failed read operation sector count -# -# Note: This event is rate-limited. -# -# Since: 2.0 -# -# Example: -# -# 1. Read operation -# -# { "event": "QUORUM_REPORT_BAD", -# "data": { "node-name": "node0", "sector-num": 345435, "sectors-count": 5, -# "type": "read" }, -# "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } -# -# 2. 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 } } -# -## -{ 'event': 'QUORUM_REPORT_BAD', - 'data': { 'type': 'QuorumOpType', '*error': 'str', 'node-name': 'str', - 'sector-num': 'int', 'sectors-count': 'int' } } - -## # @MEM_UNPLUG_ERROR: # # Emitted when memory hot unplug error occurs.
Cc: Alberto Garcia <berto@igalia.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- qapi/block.json | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qapi/event.json | 68 --------------------------------------------------------- 2 files changed, 68 insertions(+), 68 deletions(-)