Skip to content

homa_grpc 1.57 #250

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

Open
danmanj wants to merge 3 commits into
base: main
Choose a base branch
from
Open

homa_grpc 1.57 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7a2809
homa_grpc 1.57
danmanj Sep 14, 2023
f067696
re-enable homa-grpc in deploy_to_cloudlab
danmanj Sep 15, 2023
cd23ed1
this fails with
danmanj Sep 17, 2023
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
11 changes: 5 additions & 6 deletions WORKSPACE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ http_archive(
##### Unfortunately this does not compile against the latest grpc.
http_archive(
name = "grpc_homa",
sha256 = "2c0fe4669620f1a685bedf2f8ad0547cccb9155d1f4b304c5f7ce362d3b92d05",
strip_prefix = "grpc_homa-homa-2.0",
url = "https://github.com/PlatformLab/grpc_homa/archive/refs/tags/homa-2.0.tar.gz",
strip_prefix = "grpc_homa-a4ebed9f8b08e858638a05383fdc5c5df0a610a2",
url = "https://github.com/PlatformLab/grpc_homa/archive/a4ebed9f8b08e858638a05383fdc5c5df0a610a2.tar.gz",
build_file = "@//:grpc_homa.BUILD",
)

Expand All @@ -44,9 +43,9 @@ http_archive(
##### grpc_deps() and grpc_extra_deps().
http_archive(
name = "com_github_grpc_grpc",
sha256 = "931f07db9d48cff6a6007c1033ba6d691fe655bea2765444bc1ad974dfc840aa",
strip_prefix = "grpc-1.56.2",
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.56.2.tar.gz",
sha256 = "8393767af531b2d0549a4c26cf8ba1f665b16c16fb6c9238a7755e45444881dd",
strip_prefix = "grpc-1.57.0",
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.57.0.tar.gz",
)
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
grpc_deps()
Expand Down
2 changes: 1 addition & 1 deletion deploy_to_cloudlab.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ echo_magenta "\\nBuilding distbench binary..."
(cd "${WORKTREE}"; bazel build -c opt :distbench \
--//:with-mercury=true \
--//:with-homa=true \
--//:with-homa-grpc=false \
--//:with-homa-grpc=true \
"${REPO_ENV[@]}" )

echo_magenta "\\nKilling any previous distbench processes..."
Expand Down
14 changes: 14 additions & 0 deletions protocol_driver_grpc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,21 @@ absl::StatusOr<std::shared_ptr<grpc::Channel>> CreateClientChannel(
const std::string& socket_address, std::string_view transport) {
if (transport == "homa") {
#if WITH_HOMA_GRPC
LOG(ERROR) << socket_address;
LOG(ERROR) << AddGrpcProtocol(socket_address);
return HomaClient::createInsecureChannel(socket_address.data());
#if 0
return grpc::CreateCustomChannel(socket_address,
HomaClient::insecureChannelCredentials(),
DistbenchCustomChannelArguments());
return grpc::CreateCustomChannel(AddGrpcProtocol(socket_address),
HomaClient::insecureChannelCredentials(),
DistbenchCustomChannelArguments());
return grpc::CreateChannel(AddGrpcProtocol(socket_address),
HomaClient::insecureChannelCredentials());
return grpc::CreateChannel(socket_address,
HomaClient::insecureChannelCredentials());
#endif
#else
LOG(ERROR) << "Homa transport not compiled in";
LOG(ERROR) << "You must build with bazel build --//:with-homa-grpc";
Expand Down