Skip to content

Commit 8fc56c8

Browse files
kavehahmadi60meta-codesync[bot]
authored andcommitted
Remove chunking config from Graceful restart
Summary: The `shouldChunkTakeoverData` config has been true for all the users for more than a month. See D86546274 This diff just remove this config to make the code cleaner. Also, remove from `configerator` in D88687539 Reviewed By: vilatto Differential Revision: D88685795 fbshipit-source-id: 7ac294233984726b77e6b210167729493dd00127
1 parent 65edd0e commit 8fc56c8

File tree

6 files changed

+0
-49
lines changed

6 files changed

+0
-49
lines changed

eden/fs/config/EdenConfig.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -253,16 +253,6 @@ class EdenConfig : private ConfigSettingManager {
253253
std::chrono::seconds(150),
254254
this};
255255

256-
/**
257-
* Temporary config to control roll out of
258-
* TakeoverCapabilities::CHUNKED_MESSAGE protocol
259-
* Delete this config when rollout is 100% complete
260-
*/
261-
ConfigSetting<bool> shouldChunkTakeoverData{
262-
"core:should-chunk-takeover-data",
263-
true,
264-
this};
265-
266256
/**
267257
* If EdenFS should auto migrate non inmemory inode catalogs to inmemory on
268258
* Windows.

eden/fs/service/EdenServer.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2635,10 +2635,6 @@ void EdenServer::stop() {
26352635
server_->stop();
26362636
}
26372637

2638-
bool EdenServer::shouldChunkTakeoverData() {
2639-
return serverState_->getEdenConfig()->shouldChunkTakeoverData.getValue();
2640-
}
2641-
26422638
folly::Future<TakeoverData> EdenServer::startTakeoverShutdown() {
26432639
#ifndef _WIN32
26442640
// Make sure we aren't already shutting down, then update our state

eden/fs/service/EdenServer.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,6 @@ class EdenServer : private TakeoverHandler {
266266
*/
267267
folly::Future<TakeoverData> startTakeoverShutdown() override;
268268

269-
/*
270-
* This is a temporary function that override
271-
* TakeoverCapabilities::CHUNKED_MESSAGE. We use it to control the protocol
272-
* roll out through eden config. This function should remove after roll out
273-
* completes to 100%
274-
*/
275-
bool shouldChunkTakeoverData() override;
276-
277269
/**
278270
* Mount and return an EdenMount.
279271
*/

eden/fs/takeover/TakeoverHandler.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ class TakeoverHandler {
3939
virtual folly::Future<TakeoverData> startTakeoverShutdown() = 0;
4040

4141
virtual void closeStorage() = 0;
42-
43-
/*
44-
* This is a temporary function that override
45-
* TakeoverCapabilities::CHUNKED_MESSAGE. We use it to control the protocol
46-
* roll out through Eden config. This function should removed after the roll
47-
* out has completed.
48-
*/
49-
virtual bool shouldChunkTakeoverData() = 0;
5042
};
5143

5244
} // namespace facebook::eden

eden/fs/takeover/TakeoverServer.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,6 @@ Future<Unit> TakeoverServer::ConnHandler::start() noexcept {
201201
(currentState.protocolCapabilities &
202202
TakeoverCapabilities::CHUNKED_MESSAGE);
203203

204-
currentState.shouldChunk =
205-
server_->getTakeoverHandler()->shouldChunkTakeoverData();
206-
207204
return server_->getTakeoverHandler()->startTakeoverShutdown();
208205
})
209206
.via(server_->eventBase_)

eden/fs/takeover/test/TakeoverTest.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ class TestHandler : public TakeoverHandler {
4545

4646
void closeStorage() override {}
4747

48-
bool shouldChunkTakeoverData() override {
49-
/**
50-
* shouldChunkTakeoverData() is a temporary function for rolling out
51-
* TakeoverCapabilities::CHUNKED_MESSAGE protocol. In the test this value
52-
* should be true to make sure tests cover chunked data */
53-
return true;
54-
}
55-
5648
private:
5749
TakeoverData data_;
5850
};
@@ -67,14 +59,6 @@ class ErrorHandler : public TakeoverHandler {
6759
std::logic_error("purposely failing for testing"));
6860
}
6961
void closeStorage() override {}
70-
71-
bool shouldChunkTakeoverData() override {
72-
/**
73-
* shouldChunkTakeoverData() is a temporary function for rolling out
74-
* TakeoverCapabilities::CHUNKED_MESSAGE protocol. In the test this value
75-
* should be true to make sure tests cover chunked data */
76-
return true;
77-
}
7862
};
7963

8064
/**

0 commit comments

Comments
 (0)