Skip to content

dubbo: fix dubbo heart beat response #18001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zuercher merged 4 commits into from
Sep 7, 2021
Merged

dubbo: fix dubbo heart beat response #18001

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6e3779
fix dubbo heart beat response
wbpcode Sep 6, 2021
69c713b
minor update
wbpcode Sep 7, 2021
d118031
fix test
wbpcode Sep 7, 2021
06a8657
fix test
wbpcode Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,11 @@ bool DubboProtocolImpl::encode(Buffer::Instance& buffer, const MessageMetadata&
buffer.writeByte(flag);
buffer.writeByte(static_cast<uint8_t>(metadata.responseStatus()));
buffer.writeBEInt<uint64_t>(metadata.requestId());
buffer.writeBEInt<uint32_t>(0);
// Body of heart beat response is null.
// TODO(wbpcode): Currently we only support the Hessian2 serialization scheme, so here we
// directly use the 'N' for null object in Hessian2. This coupling should be unnecessary.
buffer.writeBEInt<uint32_t>(1u);
buffer.writeByte('N');
return true;
}
case MessageType::Response: {
Expand Down
14 changes: 14 additions & 0 deletions test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,20 @@ TEST(DubboProtocolImplTest, encode) {
EXPECT_TRUE(dubbo_protocol.decodeData(buffer, context, output_metadata));
}

TEST(DubboProtocolImplTest, HeartBeatResponseTest) {
MessageMetadata metadata;
metadata.setMessageType(MessageType::HeartbeatResponse);
metadata.setResponseStatus(ResponseStatus::Ok);
metadata.setSerializationType(SerializationType::Hessian2);
metadata.setRequestId(100);

Buffer::OwnedImpl buffer;
DubboProtocolImpl dubbo_protocol;
EXPECT_TRUE(dubbo_protocol.encode(buffer, metadata, ""));

@rojkov rojkov Sep 7, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like an rpc response type is missing in dubbo_protocol.encode().

@wbpcode wbpcode Sep 7, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

// 16 bytes header and one byte null object body.
EXPECT_EQ(17, buffer.length());
}

TEST(DubboProtocolImplTest, decode) {
Buffer::OwnedImpl buffer;
MessageMetadataSharedPtr metadata;
Expand Down