Skip to content

Commit a304db6

Browse files
c3y1huanginnobead
authored andcommitted
grpc-proxy: remove backup target relate gRPC
Longhorn-4076 Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
1 parent 03638c4 commit a304db6

7 files changed

Lines changed: 199 additions & 2714 deletions

File tree

generate_grpc.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ if [ ! -e ./proto/vendor/protobuf/src/google/protobuf ]; then
88
DIR="./proto/vendor/protobuf/src/google/protobuf"
99
mkdir -p $DIR
1010
wget https://raw.githubusercontent.com/protocolbuffers/protobuf/v3.9.0/src/google/protobuf/empty.proto -P $DIR
11-
wget https://raw.githubusercontent.com/protocolbuffers/protobuf/v3.9.0/src/google/protobuf/timestamp.proto -P $DIR
1211
fi
1312
DIR="./proto/vendor/github.com/longhorn/longhorn-engine/proto/ptypes"
1413
if [ ! -e ${DIR} ]; then

integration/rpc/proxy/proxy_pb2.py

Lines changed: 81 additions & 1083 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/rpc/proxy/proxy_pb2_grpc.py

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -100,31 +100,6 @@ def __init__(self, channel):
100100
request_serializer=proxy__pb2.ProxyEngineRequest.SerializeToString,
101101
response_deserializer=proxy__pb2.EngineBackupRestoreStatusProxyResponse.FromString,
102102
)
103-
self.BackupVolumeList = channel.unary_unary(
104-
'/imrpc.ProxyEngineService/BackupVolumeList',
105-
request_serializer=proxy__pb2.EngineBackupVolumeListRequest.SerializeToString,
106-
response_deserializer=proxy__pb2.EngineBackupVolumeListProxyResponse.FromString,
107-
)
108-
self.BackupVolumeGet = channel.unary_unary(
109-
'/imrpc.ProxyEngineService/BackupVolumeGet',
110-
request_serializer=proxy__pb2.EngineBackupVolumeGetRequest.SerializeToString,
111-
response_deserializer=proxy__pb2.EngineBackupVolumeGetProxyResponse.FromString,
112-
)
113-
self.BackupGet = channel.unary_unary(
114-
'/imrpc.ProxyEngineService/BackupGet',
115-
request_serializer=proxy__pb2.EngineBackupGetRequest.SerializeToString,
116-
response_deserializer=proxy__pb2.EngineBackupGetProxyResponse.FromString,
117-
)
118-
self.BackupConfigMetaGet = channel.unary_unary(
119-
'/imrpc.ProxyEngineService/BackupConfigMetaGet',
120-
request_serializer=proxy__pb2.EngineBackupConfigMetaGetRequest.SerializeToString,
121-
response_deserializer=proxy__pb2.EngineBackupConfigMetaGetProxyResponse.FromString,
122-
)
123-
self.BackupRemove = channel.unary_unary(
124-
'/imrpc.ProxyEngineService/BackupRemove',
125-
request_serializer=proxy__pb2.EngineBackupRemoveRequest.SerializeToString,
126-
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
127-
)
128103
self.ReplicaAdd = channel.unary_unary(
129104
'/imrpc.ProxyEngineService/ReplicaAdd',
130105
request_serializer=proxy__pb2.EngineReplicaAddRequest.SerializeToString,
@@ -275,41 +250,6 @@ def BackupRestoreStatus(self, request, context):
275250
context.set_details('Method not implemented!')
276251
raise NotImplementedError('Method not implemented!')
277252

278-
def BackupVolumeList(self, request, context):
279-
# missing associated documentation comment in .proto file
280-
pass
281-
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
282-
context.set_details('Method not implemented!')
283-
raise NotImplementedError('Method not implemented!')
284-
285-
def BackupVolumeGet(self, request, context):
286-
# missing associated documentation comment in .proto file
287-
pass
288-
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
289-
context.set_details('Method not implemented!')
290-
raise NotImplementedError('Method not implemented!')
291-
292-
def BackupGet(self, request, context):
293-
# missing associated documentation comment in .proto file
294-
pass
295-
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
296-
context.set_details('Method not implemented!')
297-
raise NotImplementedError('Method not implemented!')
298-
299-
def BackupConfigMetaGet(self, request, context):
300-
# missing associated documentation comment in .proto file
301-
pass
302-
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
303-
context.set_details('Method not implemented!')
304-
raise NotImplementedError('Method not implemented!')
305-
306-
def BackupRemove(self, request, context):
307-
# missing associated documentation comment in .proto file
308-
pass
309-
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
310-
context.set_details('Method not implemented!')
311-
raise NotImplementedError('Method not implemented!')
312-
313253
def ReplicaAdd(self, request, context):
314254
# missing associated documentation comment in .proto file
315255
pass
@@ -433,31 +373,6 @@ def add_ProxyEngineServiceServicer_to_server(servicer, server):
433373
request_deserializer=proxy__pb2.ProxyEngineRequest.FromString,
434374
response_serializer=proxy__pb2.EngineBackupRestoreStatusProxyResponse.SerializeToString,
435375
),
436-
'BackupVolumeList': grpc.unary_unary_rpc_method_handler(
437-
servicer.BackupVolumeList,
438-
request_deserializer=proxy__pb2.EngineBackupVolumeListRequest.FromString,
439-
response_serializer=proxy__pb2.EngineBackupVolumeListProxyResponse.SerializeToString,
440-
),
441-
'BackupVolumeGet': grpc.unary_unary_rpc_method_handler(
442-
servicer.BackupVolumeGet,
443-
request_deserializer=proxy__pb2.EngineBackupVolumeGetRequest.FromString,
444-
response_serializer=proxy__pb2.EngineBackupVolumeGetProxyResponse.SerializeToString,
445-
),
446-
'BackupGet': grpc.unary_unary_rpc_method_handler(
447-
servicer.BackupGet,
448-
request_deserializer=proxy__pb2.EngineBackupGetRequest.FromString,
449-
response_serializer=proxy__pb2.EngineBackupGetProxyResponse.SerializeToString,
450-
),
451-
'BackupConfigMetaGet': grpc.unary_unary_rpc_method_handler(
452-
servicer.BackupConfigMetaGet,
453-
request_deserializer=proxy__pb2.EngineBackupConfigMetaGetRequest.FromString,
454-
response_serializer=proxy__pb2.EngineBackupConfigMetaGetProxyResponse.SerializeToString,
455-
),
456-
'BackupRemove': grpc.unary_unary_rpc_method_handler(
457-
servicer.BackupRemove,
458-
request_deserializer=proxy__pb2.EngineBackupRemoveRequest.FromString,
459-
response_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString,
460-
),
461376
'ReplicaAdd': grpc.unary_unary_rpc_method_handler(
462377
servicer.ReplicaAdd,
463378
request_deserializer=proxy__pb2.EngineReplicaAddRequest.FromString,

pkg/client/proxy_backup.go

Lines changed: 0 additions & 196 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ package client
33
import (
44
"encoding/json"
55

6-
"github.com/golang/protobuf/ptypes"
76
"github.com/pkg/errors"
87

9-
"github.com/longhorn/backupstore"
10-
118
rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
129
)
1310

@@ -164,196 +161,3 @@ func (c *ProxyClient) BackupRestoreStatus(serviceAddress string) (status map[str
164161
}
165162
return status, nil
166163
}
167-
168-
func (c *ProxyClient) BackupGet(destURL string, envs []string) (info *EngineBackupInfo, err error) {
169-
input := map[string]string{
170-
"destURL": destURL,
171-
}
172-
if err := validateProxyMethodParameters(input); err != nil {
173-
return nil, errors.Wrap(err, "failed to get backup")
174-
}
175-
176-
defer func() {
177-
err = errors.Wrapf(err, "%v failed to get backup", c.getProxyErrorPrefix(destURL))
178-
}()
179-
180-
req := &rpc.EngineBackupGetRequest{
181-
Envs: envs,
182-
DestUrl: destURL,
183-
}
184-
recv, err := c.service.BackupGet(getContextWithGRPCTimeout(c.ctx), req)
185-
if err != nil {
186-
return nil, err
187-
}
188-
189-
return parseBackup(recv.Backup), nil
190-
}
191-
192-
func (c *ProxyClient) BackupVolumeGet(destURL string, envs []string) (info *EngineBackupVolumeInfo, err error) {
193-
input := map[string]string{
194-
"destURL": destURL,
195-
}
196-
if err := validateProxyMethodParameters(input); err != nil {
197-
return nil, errors.Wrap(err, "failed to get backup volume")
198-
}
199-
200-
defer func() {
201-
err = errors.Wrapf(err, "%v failed to get backup volume", c.getProxyErrorPrefix(destURL))
202-
}()
203-
204-
req := &rpc.EngineBackupVolumeGetRequest{
205-
Envs: envs,
206-
DestUrl: destURL,
207-
}
208-
recv, err := c.service.BackupVolumeGet(getContextWithGRPCTimeout(c.ctx), req)
209-
if err != nil {
210-
return nil, err
211-
}
212-
213-
info = &EngineBackupVolumeInfo{
214-
Name: recv.Volume.Name,
215-
Size: recv.Volume.Size,
216-
Labels: recv.Volume.Labels,
217-
Created: recv.Volume.Created,
218-
LastBackupName: recv.Volume.LastBackupName,
219-
LastBackupAt: recv.Volume.LastBackupAt,
220-
DataStored: recv.Volume.DataStored,
221-
Messages: recv.Volume.Messages,
222-
Backups: parseBackups(recv.Volume.Backups),
223-
BackingImageName: recv.Volume.BackingImageName,
224-
BackingImageChecksum: recv.Volume.BackingImageChecksum,
225-
}
226-
return info, nil
227-
}
228-
229-
func (c *ProxyClient) BackupVolumeList(destURL, volumeName string, volumeOnly bool, envs []string) (info map[string]*EngineBackupVolumeInfo, err error) {
230-
input := map[string]string{
231-
"destURL": destURL,
232-
}
233-
if err := validateProxyMethodParameters(input); err != nil {
234-
return nil, errors.Wrap(err, "failed to list backup for volumes")
235-
}
236-
237-
defer func() {
238-
if volumeName == "" {
239-
err = errors.Wrapf(err, "%v failed to list backup for volumes", c.getProxyErrorPrefix(destURL))
240-
} else {
241-
err = errors.Wrapf(err, "%v failed to list backup for volume %v", c.getProxyErrorPrefix(destURL), volumeName)
242-
}
243-
}()
244-
245-
req := &rpc.EngineBackupVolumeListRequest{
246-
Envs: envs,
247-
DestUrl: destURL,
248-
VolumeName: volumeName,
249-
VolumeOnly: volumeOnly,
250-
}
251-
recv, err := c.service.BackupVolumeList(getContextWithGRPCTimeout(c.ctx), req)
252-
if err != nil {
253-
return nil, err
254-
}
255-
256-
info = map[string]*EngineBackupVolumeInfo{}
257-
for k, v := range recv.Volumes {
258-
info[k] = &EngineBackupVolumeInfo{
259-
Name: v.Name,
260-
Size: v.Size,
261-
Labels: v.Labels,
262-
Created: v.Created,
263-
LastBackupName: v.LastBackupName,
264-
LastBackupAt: v.LastBackupAt,
265-
DataStored: v.DataStored,
266-
Messages: v.Messages,
267-
Backups: parseBackups(v.Backups),
268-
BackingImageName: v.BackingImageName,
269-
BackingImageChecksum: v.BackingImageChecksum,
270-
}
271-
}
272-
return info, nil
273-
}
274-
275-
func parseBackups(in map[string]*rpc.EngineBackupInfo) (out map[string]*EngineBackupInfo) {
276-
out = map[string]*EngineBackupInfo{}
277-
for k, v := range in {
278-
out[k] = parseBackup(v)
279-
}
280-
return out
281-
}
282-
283-
func parseBackup(in *rpc.EngineBackupInfo) (out *EngineBackupInfo) {
284-
return &EngineBackupInfo{
285-
Name: in.Name,
286-
URL: in.Url,
287-
SnapshotName: in.SnapshotName,
288-
SnapshotCreated: in.SnapshotCreated,
289-
Created: in.Created,
290-
Size: in.Size,
291-
Labels: in.Labels,
292-
IsIncremental: in.IsIncremental,
293-
VolumeName: in.VolumeName,
294-
VolumeSize: in.VolumeSize,
295-
VolumeCreated: in.VolumeCreated,
296-
VolumeBackingImageName: in.VolumeBackingImageName,
297-
Messages: in.Messages,
298-
}
299-
}
300-
301-
func (c *ProxyClient) BackupConfigMetaGet(destURL string, envs []string) (meta *backupstore.ConfigMetadata, err error) {
302-
input := map[string]string{
303-
"destURL": destURL,
304-
}
305-
if err := validateProxyMethodParameters(input); err != nil {
306-
return nil, errors.Wrap(err, "failed to get backup config metadata")
307-
}
308-
309-
defer func() {
310-
err = errors.Wrapf(err, "%v failed to get backup config metadata", c.getProxyErrorPrefix(destURL))
311-
}()
312-
313-
req := &rpc.EngineBackupConfigMetaGetRequest{
314-
Envs: envs,
315-
DestUrl: destURL,
316-
}
317-
recv, err := c.service.BackupConfigMetaGet(getContextWithGRPCTimeout(c.ctx), req)
318-
if err != nil {
319-
return nil, err
320-
}
321-
322-
ts, err := ptypes.Timestamp(recv.ModificationTime)
323-
if err != nil {
324-
return nil, err
325-
}
326-
327-
return &backupstore.ConfigMetadata{
328-
ModificationTime: ts,
329-
}, nil
330-
}
331-
332-
func (c *ProxyClient) BackupRemove(destURL, volumeName string, envs []string) (err error) {
333-
input := map[string]string{
334-
"destURL": destURL,
335-
}
336-
if err := validateProxyMethodParameters(input); err != nil {
337-
return errors.Wrap(err, "failed to remove backup")
338-
}
339-
340-
defer func() {
341-
if volumeName == "" {
342-
err = errors.Wrapf(err, "%v failed to remove backup", c.getProxyErrorPrefix(destURL))
343-
} else {
344-
err = errors.Wrapf(err, "%v failed to remove backup for volume %v", c.getProxyErrorPrefix(destURL), volumeName)
345-
}
346-
}()
347-
348-
req := &rpc.EngineBackupRemoveRequest{
349-
Envs: envs,
350-
DestUrl: destURL,
351-
VolumeName: volumeName,
352-
}
353-
_, err = c.service.BackupRemove(getContextWithGRPCTimeout(c.ctx), req)
354-
if err != nil {
355-
return err
356-
}
357-
358-
return nil
359-
}

0 commit comments

Comments
 (0)