From 51b8f26a312d559f47fb05f267fe6036b68347f5 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 21 Sep 2022 13:51:51 +0300 Subject: [PATCH] [#1806] services/control: Allow to flush write-cache Signed-off-by: Evgenii Stratonikov --- pkg/services/control/convert.go | 18 +++++++++++ pkg/services/control/ir/service.pb.go | Bin 14529 -> 14528 bytes pkg/services/control/ir/service_grpc.pb.go | Bin 3854 -> 3853 bytes pkg/services/control/ir/types.pb.go | Bin 7734 -> 7733 bytes pkg/services/control/rpc.go | 14 ++++++++ pkg/services/control/server/flush_cache.go | 36 +++++++++++++++++++++ pkg/services/control/service.pb.go | Bin 100929 -> 110686 bytes pkg/services/control/service.proto | 25 ++++++++++++++ pkg/services/control/service_grpc.pb.go | Bin 16645 -> 18212 bytes pkg/services/control/service_neofs.pb.go | Bin 47539 -> 52624 bytes pkg/services/control/types.pb.go | Bin 27109 -> 27108 bytes 11 files changed, 93 insertions(+) create mode 100644 pkg/services/control/server/flush_cache.go diff --git a/pkg/services/control/convert.go b/pkg/services/control/convert.go index 39cad6af..041af61e 100644 --- a/pkg/services/control/convert.go +++ b/pkg/services/control/convert.go @@ -182,3 +182,21 @@ func (w *evacuateShardResponseWrapper) FromGRPCMessage(m grpc.Message) error { w.EvacuateShardResponse = r return nil } + +type flushCacheResponseWrapper struct { + *FlushCacheResponse +} + +func (w *flushCacheResponseWrapper) ToGRPCMessage() grpc.Message { + return w.FlushCacheResponse +} + +func (w *flushCacheResponseWrapper) FromGRPCMessage(m grpc.Message) error { + r, ok := m.(*FlushCacheResponse) + if !ok { + return message.NewUnexpectedMessageType(m, (*FlushCacheResponse)(nil)) + } + + w.FlushCacheResponse = r + return nil +} diff --git a/pkg/services/control/ir/service.pb.go b/pkg/services/control/ir/service.pb.go index 7e1f7d9e37221498ada89759a5455e582d5ccae9..dd8fa73641778a22b3b3e58d6eb0b004648836fb 100644 GIT binary patch delta 17 ZcmX?Dc%X2?{)rDNC+<_&9Lbnr4ggt42)Fhe%@)P$~Z;oKhFb4ouO9&GH diff --git a/pkg/services/control/ir/service_grpc.pb.go b/pkg/services/control/ir/service_grpc.pb.go index 7a053876e9e10087e4954bb9124b57ab3fefe97a..bd98e881cc4ff1a8787d6706b834fadb1d5021ac 100644 GIT binary patch delta 10 RcmeB^>y?}EaN{E#J^&eW1eO2* delta 10 RcmeB`>yw-CaN`4AJ^&eQ1eE{) diff --git a/pkg/services/control/ir/types.pb.go b/pkg/services/control/ir/types.pb.go index d76fcc770028f56e76e44a0b32e6a12e10327c80..9f00354caef30819f85d86c54bcc0cd25c057609 100644 GIT binary patch delta 17 ZcmdmHv(;w8-ih}rC+<<$9L{)O1^`k*2#f## delta 18 acmdmLv(0A0-pS^S@)LJgZw_O;F9QHh!UyL7 diff --git a/pkg/services/control/rpc.go b/pkg/services/control/rpc.go index 6c70d9e6..b0be2a7f 100644 --- a/pkg/services/control/rpc.go +++ b/pkg/services/control/rpc.go @@ -17,6 +17,7 @@ const ( rpcRestoreShard = "RestoreShard" rpcSynchronizeTree = "SynchronizeTree" rpcEvacuateShard = "EvacuateShard" + rpcFlushCache = "FlushCache" ) // HealthCheck executes ControlService.HealthCheck RPC. @@ -177,3 +178,16 @@ func EvacuateShard(cli *client.Client, req *EvacuateShardRequest, opts ...client return wResp.EvacuateShardResponse, nil } + +// FlushCache executes ControlService.FlushCache RPC. +func FlushCache(cli *client.Client, req *FlushCacheRequest, opts ...client.CallOption) (*FlushCacheResponse, error) { + wResp := &flushCacheResponseWrapper{new(FlushCacheResponse)} + wReq := &requestWrapper{m: req} + + err := client.SendUnary(cli, common.CallMethodInfoUnary(serviceName, rpcFlushCache), wReq, wResp, opts...) + if err != nil { + return nil, err + } + + return wResp.FlushCacheResponse, nil +} diff --git a/pkg/services/control/server/flush_cache.go b/pkg/services/control/server/flush_cache.go new file mode 100644 index 00000000..baf1eb62 --- /dev/null +++ b/pkg/services/control/server/flush_cache.go @@ -0,0 +1,36 @@ +package control + +import ( + "context" + + "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine" + "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" + "github.com/nspcc-dev/neofs-node/pkg/services/control" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +func (s *Server) FlushCache(_ context.Context, req *control.FlushCacheRequest) (*control.FlushCacheResponse, error) { + err := s.isValidRequest(req) + if err != nil { + return nil, status.Error(codes.PermissionDenied, err.Error()) + } + + shardID := shard.NewIDFromBytes(req.GetBody().GetShard_ID()) + + var prm engine.FlushWriteCachePrm + prm.SetShardID(shardID) + + _, err = s.s.FlushWriteCache(prm) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + resp := &control.FlushCacheResponse{Body: &control.FlushCacheResponse_Body{}} + + err = SignMessage(s.key, resp) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + return resp, nil +} diff --git a/pkg/services/control/service.pb.go b/pkg/services/control/service.pb.go index 0bef278bd472473409e1c5c040646d93f2a1fbb1..104d511b6b648bad536518a599193e64d08486db 100644 GIT binary patch delta 5378 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 b!|+LZ&r$pDVJ~ev33vEY>a08k|APMmS5js5 diff --git a/pkg/services/control/service.proto b/pkg/services/control/service.proto index 3f55d3cc..fba8ee99 100644 --- a/pkg/services/control/service.proto +++ b/pkg/services/control/service.proto @@ -34,6 +34,9 @@ service ControlService { // EvacuateShard moves all data from one shard to the others. rpc EvacuateShard (EvacuateShardRequest) returns (EvacuateShardResponse); + + // FlushCache moves all data from one shard to the others. + rpc FlushCache (FlushCacheRequest) returns (FlushCacheResponse); } // Health check request. @@ -311,3 +314,25 @@ message EvacuateShardResponse { Body body = 1; Signature signature = 2; } + +// FlushCache request. +message FlushCacheRequest { + // Request body structure. + message Body { + // ID of the shard. + bytes shard_ID = 1; + } + + Body body = 1; + Signature signature = 2; +} + +// FlushCache response. +message FlushCacheResponse { + // Response body structure. + message Body { + } + + Body body = 1; + Signature signature = 2; +} diff --git a/pkg/services/control/service_grpc.pb.go b/pkg/services/control/service_grpc.pb.go index f7523b98c4080960f993c9e1070b73687a3dd775..1978deb67d45d4f355bbc2cd3815277d7ce84e01 100644 GIT binary patch delta 454 zcmZo|VqDV4IN{#L`$im-7l^ZPx#g4=XE-M&XQWQnlhQ}#I_in>X67kq!BtFlWK%^_ zu!&QHXYvDKc_g99SoLrsOqi%BI{AShH(4+|rD#=y%q`oZ8ra~-p(?4g1s=Z<^^_2 J$lUo3X#kTFpf&&i delta 41 zcmV+^0M`Gcjsb;&0g&FY-7^TYx(OEyvkDiB1+yO=DG0L{CL9^FzCpJHlg>s~N)Hbo diff --git a/pkg/services/control/service_neofs.pb.go b/pkg/services/control/service_neofs.pb.go index 70616a79801049d18ce3b127dc869ea3212ce2dc..00979f012d55631afae8a0366fd9adfc4fd478f1 100644 GIT binary patch delta 242 zcmdn|nQ6jo<_(*7PM#3c$?29;TAbmWn4B@$Fhq3nzd+l~#w-&VQG{<#{=z$r3$8GA z^EzfRCWMO34b!GFAxTfZAbS@fJDGo0KCHwl+W`QM>t3n= delta 9 RcmbO*n|bqRrVX2S0st2-1oHp@ diff --git a/pkg/services/control/types.pb.go b/pkg/services/control/types.pb.go index 4f95fa12ae37384f0212aa292d14c02e35e3ca28..7056a225f38a593628095f94fcfd090224db0cf5 100644 GIT binary patch delta 19 bcmaEQneoYG#tFM7-maXuQ(5UIp9aYyy$V8)3V0P2ns$N&HU