Skip to content

Commit 319d760

Browse files
Paul Cruzfacebook-github-bot
authored andcommitted
Replace all instances of HeaderClientChannel::newChannel with (facebook#418)
Summary: This is for the purpose of testing a hypothesis that some internal difference between HeaderClientChannel and RocketClientChannel is causing high latency/hangs during thrift requests to FBOSS services in OSS. Differential Revision: D73672539
1 parent 5afda37 commit 319d760

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

fboss/agent/test/MultiNodeOpenrTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ std::unique_ptr<Client> createPlaintextClient(const int port) {
4242
auto sock = folly::AsyncSocket::newSocket(eb, addr, kConnTimeout);
4343
sock->setSendTimeout(kSendTimeout);
4444
auto channel =
45-
apache::thrift::HeaderClientChannel::newChannel(std::move(sock));
45+
apache::thrift::RocketClientChannel::newChannel(std::move(sock));
4646
channel->setTimeout(kRecvTimeout);
4747
return std::make_unique<Client>(std::move(channel));
4848
}

fboss/agent/test/MultiNodeTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ std::unique_ptr<FbossCtrlAsyncClient> MultiNodeTest::getRemoteThriftClient()
127127
FLAGS_multiNodeTestRemoteSwitchName);
128128
folly::SocketAddress agent(remoteSwitchIp, 5909);
129129
auto socket = folly::AsyncSocket::newSocket(eb, agent);
130-
auto chan = HeaderClientChannel::newChannel(std::move(socket));
130+
auto chan = RocketClientChannel::newChannel(std::move(socket));
131131
return std::make_unique<FbossCtrlAsyncClient>(std::move(chan));
132132
}
133133

fboss/cli/fboss2/utils/CmdClientUtilsCommon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ std::unique_ptr<Client> createPlaintextClient(
4343
auto sock = folly::AsyncSocket::newSocket(eb, addr, kConnTimeout);
4444
sock->setSendTimeout(kSendTimeout);
4545
auto channel =
46-
apache::thrift::HeaderClientChannel::newChannel(std::move(sock));
46+
apache::thrift::RocketClientChannel::newChannel(std::move(sock));
4747
channel->setTimeout(kRecvTimeout);
4848
return std::make_unique<Client>(std::move(channel));
4949
}

fboss/qsfp_service/lib/oss/QsfpClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ QsfpClient::createClient(folly::EventBase* eb) {
1919
auto socket = folly::AsyncSocket::newSocket(eb, addr, kQsfpConnTimeoutMs);
2020
socket->setSendTimeout(kQsfpSendTimeoutMs);
2121
auto channel =
22-
apache::thrift::HeaderClientChannel::newChannel(std::move(socket));
22+
apache::thrift::RocketClientChannel::newChannel(std::move(socket));
2323
return std::make_unique<apache::thrift::Client<QsfpService>>(
2424
std::move(channel));
2525
};

fboss/qsfp_service/lib/test/QsfpCacheExerciser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ std::unique_ptr<apache::thrift::Client<FbossCtrl>> fbossAgentClient() {
3232
folly::EventBase* eb = folly::EventBaseManager::get()->getEventBase();
3333
folly::SocketAddress agent(FLAGS_qsfp_service_host, 5909);
3434
auto socket = folly::AsyncSocket::newSocket(eb, agent);
35-
auto chan = HeaderClientChannel::newChannel(std::move(socket));
35+
auto chan = RocketClientChannel::newChannel(std::move(socket));
3636
return std::make_unique<apache::thrift::Client<FbossCtrl>>(std::move(chan));
3737
}
3838

fboss/util/ThriftStateUpdater.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ std::unique_ptr<facebook::fboss::FbossCtrlAsyncClient> createAgentClient(
5252
auto sock = folly::AsyncSocket::newSocket(eb, addr, kConnTimeout);
5353
sock->setSendTimeout(kSendTimeout);
5454
auto channel =
55-
apache::thrift::HeaderClientChannel::newChannel(std::move(sock));
55+
apache::thrift::RocketClientChannel::newChannel(std::move(sock));
5656
channel->setTimeout(kRecvTimeout);
5757

5858
return std::make_unique<facebook::fboss::FbossCtrlAsyncClient>(

0 commit comments

Comments
 (0)