@@ -7,7 +7,7 @@ use crate::license::LicensedFeature;
77use crate :: types:: { ResolveEntityId , SqliteEnumExt } ;
88use anyhow:: { Context as AContext , Result , anyhow, bail} ;
99use protobuf:: { beegfs as pb, management as pm} ;
10- use rusqlite:: { OptionalExtension , Transaction , TransactionBehavior , params} ;
10+ use rusqlite:: { OptionalExtension , Row , Transaction , TransactionBehavior , named_params , params} ;
1111use shared:: grpc:: * ;
1212use shared:: impl_grpc_handler;
1313use shared:: run_state:: RunStateHandle ;
@@ -21,13 +21,28 @@ use std::pin::Pin;
2121use tonic:: transport:: { Identity , Server , ServerTlsConfig } ;
2222use tonic:: { Code , Request , Response , Status } ;
2323
24- mod buddy_group;
25- mod license;
26- mod misc;
27- mod node;
28- mod pool;
29- mod quota;
30- mod target;
24+ mod common;
25+
26+ mod assign_pool;
27+ mod create_buddy_group;
28+ mod create_pool;
29+ mod delete_buddy_group;
30+ mod delete_node;
31+ mod delete_pool;
32+ mod delete_target;
33+ mod get_buddy_groups;
34+ mod get_license;
35+ mod get_nodes;
36+ mod get_pools;
37+ mod get_quota_limits;
38+ mod get_quota_usage;
39+ mod get_targets;
40+ mod mirror_root_inode;
41+ mod set_alias;
42+ mod set_default_quota_limits;
43+ mod set_quota_limits;
44+ mod set_target_state;
45+ mod start_resync;
3146
3247/// Management gRPC service implementation struct
3348#[ derive( Debug ) ]
@@ -44,8 +59,9 @@ impl pm::management_server::Management for ManagementService {
4459 // Example: Implement pm::management_server::Management::set_alias using the impl_grpc_handler
4560 // macro
4661 impl_grpc_handler ! {
47- // <the function to implement (as defined by the trait)> => <the actual, custom handler function to call>,
48- set_alias => misc:: set_alias,
62+ // the function to implement (as defined by the trait) as well as the handler to call (must
63+ // be named the same and in a submodule named the same),
64+ set_alias,
4965 // <request message passed to the fn impl (as defined by the trait)> => <response message,
5066 // returned by the fn impl (as defined by the trait)>,
5167 pm:: SetAliasRequest => pm:: SetAliasResponse ,
@@ -54,102 +70,102 @@ impl pm::management_server::Management for ManagementService {
5470 }
5571
5672 impl_grpc_handler ! {
57- get_nodes => node :: get ,
73+ get_nodes,
5874 pm:: GetNodesRequest => pm:: GetNodesResponse ,
5975 "Get nodes"
6076 }
6177 impl_grpc_handler ! {
62- delete_node => node :: delete ,
78+ delete_node,
6379 pm:: DeleteNodeRequest => pm:: DeleteNodeResponse ,
6480 "Delete node"
6581 }
6682
6783 impl_grpc_handler ! {
68- get_targets => target :: get ,
84+ get_targets,
6985 pm:: GetTargetsRequest => pm:: GetTargetsResponse ,
7086 "Get targets"
7187 }
7288 impl_grpc_handler ! {
73- delete_target => target :: delete ,
89+ delete_target,
7490 pm:: DeleteTargetRequest => pm:: DeleteTargetResponse ,
7591 "Delete target"
7692 }
7793 impl_grpc_handler ! {
78- set_target_state => target :: set_state ,
94+ set_target_state,
7995 pm:: SetTargetStateRequest => pm:: SetTargetStateResponse ,
8096 "Set target state"
8197 }
8298
8399 impl_grpc_handler ! {
84- get_pools => pool :: get ,
100+ get_pools,
85101 pm:: GetPoolsRequest => pm:: GetPoolsResponse ,
86102 "Get pools"
87103 }
88104 impl_grpc_handler ! {
89- create_pool => pool :: create ,
105+ create_pool,
90106 pm:: CreatePoolRequest => pm:: CreatePoolResponse ,
91107 "Create pool"
92108 }
93109 impl_grpc_handler ! {
94- assign_pool => pool :: assign ,
110+ assign_pool,
95111 pm:: AssignPoolRequest => pm:: AssignPoolResponse ,
96112 "Assign pool"
97113 }
98114 impl_grpc_handler ! {
99- delete_pool => pool :: delete ,
115+ delete_pool,
100116 pm:: DeletePoolRequest => pm:: DeletePoolResponse ,
101117 "Delete pool"
102118 }
103119
104120 impl_grpc_handler ! {
105- get_buddy_groups => buddy_group :: get ,
121+ get_buddy_groups,
106122 pm:: GetBuddyGroupsRequest => pm:: GetBuddyGroupsResponse ,
107123 "Get buddy groups"
108124 }
109125 impl_grpc_handler ! {
110- create_buddy_group => buddy_group :: create ,
126+ create_buddy_group,
111127 pm:: CreateBuddyGroupRequest => pm:: CreateBuddyGroupResponse ,
112128 "Create buddy group"
113129 }
114130 impl_grpc_handler ! {
115- delete_buddy_group => buddy_group :: delete ,
131+ delete_buddy_group,
116132 pm:: DeleteBuddyGroupRequest => pm:: DeleteBuddyGroupResponse ,
117133 "Delete buddy group"
118134 }
119135 impl_grpc_handler ! {
120- mirror_root_inode => buddy_group :: mirror_root_inode ,
136+ mirror_root_inode,
121137 pm:: MirrorRootInodeRequest => pm:: MirrorRootInodeResponse ,
122138 "Mirror root inode"
123139 }
124140 impl_grpc_handler ! {
125- start_resync => buddy_group :: start_resync ,
141+ start_resync,
126142 pm:: StartResyncRequest => pm:: StartResyncResponse ,
127143 "Start resync"
128144 }
129145
130146 impl_grpc_handler ! {
131- set_default_quota_limits => quota :: set_default_quota_limits ,
147+ set_default_quota_limits,
132148 pm:: SetDefaultQuotaLimitsRequest => pm:: SetDefaultQuotaLimitsResponse ,
133149 "Set default quota limits"
134150 }
135151 impl_grpc_handler ! {
136- set_quota_limits => quota :: set_quota_limits ,
152+ set_quota_limits,
137153 pm:: SetQuotaLimitsRequest => pm:: SetQuotaLimitsResponse ,
138154 "Set quota limits"
139155 }
140156 impl_grpc_handler ! {
141- get_quota_limits => quota :: get_quota_limits ,
157+ get_quota_limits,
142158 pm:: GetQuotaLimitsRequest => STREAM ( GetQuotaLimitsStream , pm:: GetQuotaLimitsResponse ) ,
143159 "Get quota limits"
144160 }
145161 impl_grpc_handler ! {
146- get_quota_usage => quota :: get_quota_usage ,
162+ get_quota_usage,
147163 pm:: GetQuotaUsageRequest => STREAM ( GetQuotaUsageStream , pm:: GetQuotaUsageResponse ) ,
148164 "Get quota usage"
149165 }
150166
151167 impl_grpc_handler ! {
152- get_license => license :: get ,
168+ get_license,
153169 pm:: GetLicenseRequest => pm:: GetLicenseResponse ,
154170 "Get license"
155171 }
0 commit comments