rbd: output notifyOp request name when watching #20551
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dillaman
reviewed
Feb 23, 2018
src/librbd/WatchNotifyTypes.h
Outdated
| @@ -339,6 +339,7 @@ struct NotifyMessage { | |||
| void encode(bufferlist& bl) const; | |||
| void decode(bufferlist::iterator& it); | |||
| void dump(Formatter *f) const; | |||
| NotifyOp getOp() const; | |||
src/librbd/WatchNotifyTypes.cc
Outdated
| @@ -21,6 +21,14 @@ class CheckForRefreshVisitor : public boost::static_visitor<bool> { | |||
| } | |||
| }; | |||
|
|
|||
| class GetNotifyOPVisitor : public boost::static_visitor<int> { | |||
src/librbd/WatchNotifyTypes.cc
Outdated
| @@ -21,6 +21,14 @@ class CheckForRefreshVisitor : public boost::static_visitor<bool> { | |||
| } | |||
| }; | |||
|
|
|||
| class GetNotifyOPVisitor : public boost::static_visitor<int> { | |||
src/librbd/WatchNotifyTypes.cc
Outdated
| apply_visitor(GetNotifyOPVisitor(), payload); | ||
| } | ||
|
|
||
|
|
src/tools/rbd/action/Watch.cc
Outdated
| bufferlist::iterator iter = bl.begin(); | ||
| notify_message.decode(iter); | ||
| } catch (const buffer::error &err) { | ||
| std::cout << __func__ << " error decoding image notification: " |
There was a problem hiding this comment.
Nit: std::cerr << "rbd: failed to decode image notification" << std::endl;
src/tools/rbd/action/Watch.cc
Outdated
| } catch (const buffer::error &err) { | ||
| std::cout << __func__ << " error decoding image notification: " | ||
| << err.what() << std::endl; | ||
| return; |
There was a problem hiding this comment.
... no need to return since it will default to unknown payload.
output notifyOp request name when watching, which is more easier to dentify what happend. Signed-off-by: shun-s <song.shun3@zte.com.cn>
shun-s
force-pushed
the
wip-add-notify-name-print
branch
from
911a22e
to
db58878
Compare
|
@dillaman all your requirements are done, please take a look again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
output notifyOp request name when watching,
which is more easier to dentify what happend.
Signed-off-by: shun-s song.shun3@zte.com.cn