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.

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

Jump to bottom

add resource_control grpc API for pd_client #147

Merged
merged 7 commits into from
Jun 15, 2023
Merged

add resource_control grpc API for pd_client #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d523e8a
tmp save
guo-shaoge Jun 8, 2023
f400967
add pd_client resource_control grpc api
guo-shaoge Jun 9, 2023
9b046ce
fix
guo-shaoge Jun 10, 2023
2c991ef
Merge branch 'master' into resource_control
guo-shaoge Jun 15, 2023
4eb5d77
fix stub
guo-shaoge Jun 15, 2023
861eb42
refine macro name
guo-shaoge Jun 15, 2023
6f5123a
Merge branch 'resource_control' of github.com:guo-shaoge/client-c int…
guo-shaoge Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions include/pingcap/pd/Client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <kvproto/keyspacepb.grpc.pb.h>
#include <kvproto/keyspacepb.pb.h>
#include <kvproto/pdpb.grpc.pb.h>
#include <kvproto/resource_manager.grpc.pb.h>
#include <pingcap/Config.h>
#include <pingcap/Log.h>
#include <pingcap/pd/IClient.h>
Expand Down Expand Up @@ -64,6 +65,18 @@ class Client : public IClient

std::string getLeaderUrl() override;

// ResourceControl related.
resource_manager::ListResourceGroupsResponse listResourceGroups(const resource_manager::ListResourceGroupsRequest &) override;

resource_manager::GetResourceGroupResponse getResourceGroup(const resource_manager::GetResourceGroupRequest &) override;

resource_manager::PutResourceGroupResponse addResourceGroup(const resource_manager::PutResourceGroupRequest &) override;
guo-shaoge marked this conversation as resolved.
Show resolved Hide resolved

resource_manager::PutResourceGroupResponse modifyResourceGroup(const resource_manager::PutResourceGroupRequest &) override;

resource_manager::DeleteResourceGroupResponse deleteResourceGroup(const resource_manager::DeleteResourceGroupRequest &) override;

std::shared_ptr<grpc::ClientReaderWriter<resource_manager::TokenBucketsRequest, resource_manager::TokenBucketsResponse>> acquireTokenBuckets() override;
private:
void initClusterID();

Expand All @@ -82,6 +95,7 @@ class Client : public IClient
std::shared_ptr<grpc::Channel> channel;
std::unique_ptr<pdpb::PD::Stub> stub;
std::unique_ptr<keyspacepb::Keyspace::Stub> keyspace_stub;
std::unique_ptr<resource_manager::ResourceManager::Stub> resource_manager_stub;
PDConnClient(std::string addr, const ClusterConfig & config)
{
if (config.hasTlsConfig())
Expand All @@ -94,6 +108,7 @@ class Client : public IClient
}
stub = pdpb::PD::NewStub(channel);
keyspace_stub = keyspacepb::Keyspace::NewStub(channel);
resource_manager_stub = resource_manager::ResourceManager::NewStub(channel);
}
};

Expand Down
14 changes: 14 additions & 0 deletions include/pingcap/pd/IClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <kvproto/enginepb.pb.h>
#include <kvproto/pdpb.pb.h>
#include <kvproto/resource_manager.pb.h>
#pragma GCC diagnostic pop
#include <pingcap/Config.h>

Expand Down Expand Up @@ -54,6 +55,19 @@ class IClient
virtual bool isMock() = 0;

virtual std::string getLeaderUrl() = 0;

// ResourceControl related.
virtual resource_manager::ListResourceGroupsResponse listResourceGroups(const resource_manager::ListResourceGroupsRequest &) = 0;

virtual resource_manager::GetResourceGroupResponse getResourceGroup(const resource_manager::GetResourceGroupRequest &) = 0;

virtual resource_manager::PutResourceGroupResponse addResourceGroup(const resource_manager::PutResourceGroupRequest &) = 0;

virtual resource_manager::PutResourceGroupResponse modifyResourceGroup(const resource_manager::PutResourceGroupRequest &) = 0;

virtual resource_manager::DeleteResourceGroupResponse deleteResourceGroup(const resource_manager::DeleteResourceGroupRequest &) = 0;

virtual std::shared_ptr<grpc::ClientReaderWriter<resource_manager::TokenBucketsRequest, resource_manager::TokenBucketsResponse>> acquireTokenBuckets() = 0;
};

using ClientPtr = std::shared_ptr<IClient>;
Expand Down
18 changes: 18 additions & 0 deletions include/pingcap/pd/MockPDClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,24 @@ class MockPDClient : public IClient
bool isMock() override { return true; }

std::string getLeaderUrl() override { throw Exception("not implemented", pingcap::ErrorCodes::UnknownError); }

::resource_manager::ListResourceGroupsResponse listResourceGroups(const ::resource_manager::ListResourceGroupsRequest &) override
{ throw Exception("not implemented", pingcap::ErrorCodes::UnknownError); }

::resource_manager::GetResourceGroupResponse getResourceGroup(const ::resource_manager::GetResourceGroupRequest &) override
{ throw Exception("not implemented", pingcap::ErrorCodes::UnknownError); }

::resource_manager::PutResourceGroupResponse addResourceGroup(const ::resource_manager::PutResourceGroupRequest &) override
{ throw Exception("not implemented", pingcap::ErrorCodes::UnknownError); }

::resource_manager::PutResourceGroupResponse modifyResourceGroup(const ::resource_manager::PutResourceGroupRequest &) override
{ throw Exception("not implemented", pingcap::ErrorCodes::UnknownError); }

::resource_manager::DeleteResourceGroupResponse deleteResourceGroup(const ::resource_manager::DeleteResourceGroupRequest &) override
{ throw Exception("not implemented", pingcap::ErrorCodes::UnknownError); }

std::shared_ptr<grpc::ClientReaderWriter<resource_manager::TokenBucketsRequest, resource_manager::TokenBucketsResponse>> acquireTokenBuckets() override
{ throw Exception("not implemented", pingcap::ErrorCodes::UnknownError); }
};

} // namespace pd
Expand Down
30 changes: 30 additions & 0 deletions src/pd/Client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,5 +508,35 @@ bool Client::isClusterBootstrapped()
return response.bootstrapped();
}

#define RESOURCE_CONTROL_FUNCTION_DEFINITION(FUNC_NAME, GRPC_METHOD, REQUEST_TYPE, RESPONSE_TYPE) \
::resource_manager::RESPONSE_TYPE Client::FUNC_NAME(const ::resource_manager::REQUEST_TYPE & request) \
{ \
::resource_manager::RESPONSE_TYPE response; \
grpc::ClientContext context; \
context.set_deadline(std::chrono::system_clock::now() + pd_timeout); \
auto status = leaderClient()->resource_manager_stub->GRPC_METHOD(&context, request, &response); \
if (!status.ok()) \
{ \
std::string err_msg = ("resource manager grpc call failed: " #GRPC_METHOD ". " + std::to_string(status.error_code()) + ": " + status.error_message()); \
log->error(err_msg); \
check_leader.store(true); \
throw Exception(err_msg, GRPCErrorCode); \
} \
return response; \
}

RESOURCE_CONTROL_FUNCTION_DEFINITION(listResourceGroups, ListResourceGroups, ListResourceGroupsRequest, ListResourceGroupsResponse)
RESOURCE_CONTROL_FUNCTION_DEFINITION(getResourceGroup, GetResourceGroup, GetResourceGroupRequest, GetResourceGroupResponse)
RESOURCE_CONTROL_FUNCTION_DEFINITION(addResourceGroup, AddResourceGroup, PutResourceGroupRequest, PutResourceGroupResponse)
RESOURCE_CONTROL_FUNCTION_DEFINITION(modifyResourceGroup, ModifyResourceGroup, PutResourceGroupRequest, PutResourceGroupResponse)
RESOURCE_CONTROL_FUNCTION_DEFINITION(deleteResourceGroup, DeleteResourceGroup, DeleteResourceGroupRequest, DeleteResourceGroupResponse)

std::shared_ptr<grpc::ClientReaderWriter<resource_manager::TokenBucketsRequest, resource_manager::TokenBucketsResponse>> Client::acquireTokenBuckets()
{
resource_manager::TokenBucketsResponse response;
grpc::ClientContext context;
return leaderClient()->resource_manager_stub->AcquireTokenBuckets(&context);
}

} // namespace pd
} // namespace pingcap