Skip to content
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.

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

Affinitize server call notification #6612

Merged
merged 72 commits into from
May 24, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
76cfc6a
Some comments
sreecha Apr 8, 2016
42b004a
first cut of changes
sreecha Apr 8, 2016
47ef37a
test cases
sreecha Apr 12, 2016
89bbc78
Rewrite test case to handle more scenarios
sreecha Apr 12, 2016
fe11589
Delete debug log lines
sreecha Apr 12, 2016
5e28d71
fix formatting
sreecha Apr 12, 2016
9e926e8
Test failures fix
sreecha Apr 14, 2016
020cdb8
Merge branch 'master' into server_channel_affinity
sreecha Apr 14, 2016
1f5e262
Add the option of adding a non-listening server completion queue. Thi…
sreecha Apr 21, 2016
7def036
Add a safety check to ensure atleast one of the completion queues is
sreecha Apr 21, 2016
0190712
generate_projects.sh and fix copyright year
sreecha Apr 21, 2016
0b9fdd8
clang format fix
sreecha Apr 22, 2016
3049976
Merge branch 'master' into server_channel_affinity
sreecha Apr 26, 2016
cfa6401
Merge branch 'master' into server_channel_affinity
sreecha Apr 27, 2016
192afb9
Merge remote-tracking branch 'upstream/master' into server_channel_af…
sreecha Apr 27, 2016
a2b5495
Merge branch 'master' into server_channel_affinity
sreecha Apr 29, 2016
b69251c
Merge branch 'master' into server_channel_affinity
sreecha May 3, 2016
8dbe2cb
Merge branch 'master' into server_channel_affinity
sreecha May 10, 2016
0888911
Merge branch 'master' into server_channel_affinity
sreecha May 11, 2016
f7a670f
Merge branch 'server_channel_affinity' of github.com:sreecha/grpc int…
ctiller May 14, 2016
b1d3b36
Add affinity to ev_poll_posix
ctiller May 14, 2016
1102faf
Merge branch 'connect_first' into test_affine
ctiller May 14, 2016
4790263
Merge branch 'master' into server_channel_affinity
sreecha May 16, 2016
cefa378
Add affinity to ev_poll_posix
ctiller May 14, 2016
a0e10d4
Merge branch 'better_wakeups' into test_affine
ctiller May 16, 2016
c3b88b0
Better testing
ctiller May 16, 2016
418a821
Begin sharding request queues per cq
ctiller May 16, 2016
9f9d422
Further server cq affinity work
ctiller May 17, 2016
40945c7
Add missing function for completion queue
ctiller May 17, 2016
11e304a
Fix the failing test. (Adding fd was caling 'kicked_without_pollers'
sreecha May 17, 2016
98a185a
Change error to warning since we do not have a good way to determine
sreecha May 17, 2016
8c34e7c
Fix a typo
sreecha May 17, 2016
cf2cce6
Bug fixes
ctiller May 17, 2016
88ef00e
Remove broken test
ctiller May 17, 2016
96c3236
Merge branch 'master' into server_channel_affinity
sreecha May 18, 2016
8231a0a
Merge branch 'master' into server_channel_affinity
sreecha May 18, 2016
fa92da7
Merge branch 'master' into server_channel_affinity
sreecha May 18, 2016
9766f4f
Merge github.com:grpc/grpc into test_affine
ctiller May 18, 2016
db7c356
Work stealing between affinitized cqs
ctiller May 19, 2016
4221c37
Merge branch 'test_affine' of github.com:ctiller/grpc into test_affine
ctiller May 19, 2016
3eee9b4
Mark sync cq as non-listening when it is
ctiller May 19, 2016
2272d7a
Merge branch 'test_affine' of github.com:ctiller/grpc into test_affine
ctiller May 19, 2016
2afdc93
Unrevert protobuf version
ctiller May 20, 2016
29dc490
clang-format
ctiller May 20, 2016
8ad69bf
Attempt to fix Windows
ctiller May 20, 2016
aae6c2c
Fix server plugin test
ctiller May 20, 2016
0e314bc
Merge branch 'server_channel_affinity' of github.com:sreecha/grpc int…
ctiller May 20, 2016
20431a8
Fix merge
ctiller May 20, 2016
e004958
Fix formatting, mem leak, stall
ctiller May 20, 2016
718ce51
Fix server plugin test
ctiller May 20, 2016
139040b
Merge github.com:grpc/grpc into test_affine
ctiller May 20, 2016
8a7fe1a
Fix crash
ctiller May 20, 2016
c0cb23b
Merge branch 'guess_cpu' into test_affine
ctiller May 20, 2016
f1cde58
Disable legacy poller testing: seems like there is a bug, its legacy
ctiller May 20, 2016
d88e15c
Remove legacy poller
ctiller May 20, 2016
ae09d9d
Fixes and code simplification
ctiller May 21, 2016
509b30e
Fix non-listening cq registration so that calls can be queued against…
ctiller May 21, 2016
3f3312e
Remove spam
ctiller May 21, 2016
fa96d86
Fix comments
ctiller May 21, 2016
4265fa1
clang-format
ctiller May 21, 2016
e76528c
Revert "Remove spam"
ctiller May 21, 2016
34c6e87
Simpler trick to force a listening cq
ctiller May 21, 2016
bc7593d
Revert "Revert "Remove spam""
ctiller May 21, 2016
5f04538
Fix protobuf
ctiller May 22, 2016
4609754
Merge github.com:grpc/grpc into test_affine
ctiller May 22, 2016
8ec4097
Merge github.com:grpc/grpc into test_affine
ctiller May 23, 2016
c4c6ecf
Merge github.com:grpc/grpc into test_affine
ctiller May 23, 2016
8c2d373
Merge branch 'test_affine' of github.com:ctiller/grpc into test_affine
ctiller May 23, 2016
e67f7b6
Fix timeout on async server shutdown
ctiller May 23, 2016
116b3c5
Merge github.com:grpc/grpc into test_affine
ctiller May 23, 2016
825cd45
Cleanup redundant tests
ctiller May 23, 2016
e0ddc35
Speed up tests
ctiller May 23, 2016
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
Prev Previous commit
Next Next commit
Fix server plugin test
  • Loading branch information
ctiller committed May 20, 2016
commit aae6c2cb961a3cbf8fe2681a7316a270af7bf718
2 changes: 1 addition & 1 deletion src/cpp/server/server_builder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {

if (num_frequently_polled_cqs == 0) {
gpr_log(GPR_ERROR,
"Atleast one of the completion queues must be frequently polled");
"At least one of the completion queues must be frequently polled");
return nullptr;
}

Expand Down
2 changes: 2 additions & 0 deletions test/cpp/end2end/server_builder_plugin_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
void StartServer() {
grpc::string server_address = "localhost:" + to_string(port_);
builder_->AddListeningPort(server_address, InsecureServerCredentials());
cq_ = builder_->AddCompletionQueue();
server_ = builder_->BuildAndStart();
EXPECT_TRUE(builder_->plugins_[PLUGIN_NAME] != nullptr);
}
Expand Down Expand Up @@ -219,6 +220,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
std::unique_ptr<ServerBuilder> builder_;
std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_;
std::unique_ptr<Server> server_;
std::unique_ptr<ServerCompletionQueue> cq_;
TestServiceImpl service_;
int port_;
};
Expand Down